phoenix git commit: PHOENIX-3148 Reduce size of PTable so that more tables can be cached in the metada cache

2016-08-23 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.2 58cdea6bd -> 25e8fdbce


PHOENIX-3148 Reduce size of PTable so that more tables can be cached in the 
metada cache


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

Branch: refs/heads/4.8-HBase-1.2
Commit: 25e8fdbce13101cb15a51105a9f84ac5bcc7bbb5
Parents: 58cdea6
Author: Thomas D'Silva 
Authored: Fri Aug 19 16:39:28 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 23 22:59:26 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   1 -
 .../apache/phoenix/execute/MutationState.java   |   6 +-
 .../query/ConnectionQueryServicesImpl.java  |   5 +-
 .../query/ConnectionlessQueryServicesImpl.java  |   4 +-
 .../org/apache/phoenix/query/QueryServices.java |   2 +
 .../phoenix/query/QueryServicesOptions.java |   3 +
 .../apache/phoenix/schema/MetaDataClient.java   |  25 +-
 .../apache/phoenix/schema/PMetaDataCache.java   | 221 +++
 .../apache/phoenix/schema/PMetaDataImpl.java| 268 +++
 .../org/apache/phoenix/schema/PTableImpl.java   |  29 +-
 .../org/apache/phoenix/schema/PTableRef.java|  56 ++--
 .../apache/phoenix/schema/PTableRefFactory.java |  52 
 .../apache/phoenix/schema/PTableRefImpl.java|  39 +++
 .../phoenix/schema/SerializedPTableRef.java |  47 
 .../schema/SerializedPTableRefFactory.java  |  37 +++
 .../phoenix/schema/PMetaDataImplTest.java   |  34 ++-
 16 files changed, 532 insertions(+), 297 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/25e8fdbc/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index c66fea3..16db876 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,7 +37,6 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
-import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/25e8fdbc/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
index 7a9282c..e7e6aa7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
@@ -680,7 +680,7 @@ public class MutationState implements SQLCloseable {
 return Iterators.emptyIterator();
 }
 Long scn = connection.getSCN();
-final long timestamp = (tableTimestamp!=null && 
tableTimestamp!=QueryConstants.UNSET_TIMESTAMP) ? tableTimestamp : (scn == null 
? HConstants.LATEST_TIMESTAMP : scn);
+final long timestamp = getMutationTimestamp(tableTimestamp, scn);
 return new Iterator>() {
 private Map.Entry> current = iterator.next();
 private Iterator> innerIterator = 
init();
@@ -726,6 +726,10 @@ public class MutationState implements SQLCloseable {
 
 };
 }
+
+public static long getMutationTimestamp(final Long tableTimestamp, Long 
scn) {
+return (tableTimestamp!=null && 
tableTimestamp!=QueryConstants.UNSET_TIMESTAMP) ? tableTimestamp : (scn == null 
? HConstants.LATEST_TIMESTAMP : scn);
+}
 
 /**
  * Validates that the meta data is valid against the server meta data if 
we haven't yet done so.

http://git-wip-us.apache.org/repos/asf/phoenix/blob/25e8fdbc/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index a5dcca8..6d6f977 100644
---

phoenix git commit: PHOENIX-3148 Reduce size of PTable so that more tables can be cached in the metada cache

2016-08-23 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.0 afe7f446c -> 015b698a2


PHOENIX-3148 Reduce size of PTable so that more tables can be cached in the 
metada cache


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

Branch: refs/heads/4.8-HBase-1.0
Commit: 015b698a27d3847b6fce2e36f6586717cc120406
Parents: afe7f44
Author: Thomas D'Silva 
Authored: Fri Aug 19 16:39:28 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 23 22:56:28 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   1 -
 .../apache/phoenix/execute/MutationState.java   |   6 +-
 .../query/ConnectionQueryServicesImpl.java  |   5 +-
 .../query/ConnectionlessQueryServicesImpl.java  |   4 +-
 .../org/apache/phoenix/query/QueryServices.java |   2 +
 .../phoenix/query/QueryServicesOptions.java |   3 +
 .../apache/phoenix/schema/MetaDataClient.java   |  25 +-
 .../apache/phoenix/schema/PMetaDataCache.java   | 221 +++
 .../apache/phoenix/schema/PMetaDataImpl.java| 268 +++
 .../org/apache/phoenix/schema/PTableImpl.java   |  29 +-
 .../org/apache/phoenix/schema/PTableRef.java|  56 ++--
 .../apache/phoenix/schema/PTableRefFactory.java |  52 
 .../apache/phoenix/schema/PTableRefImpl.java|  39 +++
 .../phoenix/schema/SerializedPTableRef.java |  47 
 .../schema/SerializedPTableRefFactory.java  |  37 +++
 .../phoenix/schema/PMetaDataImplTest.java   |  34 ++-
 16 files changed, 532 insertions(+), 297 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/015b698a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index c66fea3..16db876 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,7 +37,6 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
-import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/015b698a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
index 38d24aa..359565a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
@@ -681,7 +681,7 @@ public class MutationState implements SQLCloseable {
 return Iterators.emptyIterator();
 }
 Long scn = connection.getSCN();
-final long timestamp = (tableTimestamp!=null && 
tableTimestamp!=QueryConstants.UNSET_TIMESTAMP) ? tableTimestamp : (scn == null 
? HConstants.LATEST_TIMESTAMP : scn);
+final long timestamp = getMutationTimestamp(tableTimestamp, scn);
 return new Iterator>() {
 private Map.Entry> current = iterator.next();
 private Iterator> innerIterator = 
init();
@@ -727,6 +727,10 @@ public class MutationState implements SQLCloseable {
 
 };
 }
+
+public static long getMutationTimestamp(final Long tableTimestamp, Long 
scn) {
+return (tableTimestamp!=null && 
tableTimestamp!=QueryConstants.UNSET_TIMESTAMP) ? tableTimestamp : (scn == null 
? HConstants.LATEST_TIMESTAMP : scn);
+}
 
 /**
  * Validates that the meta data is valid against the server meta data if 
we haven't yet done so.

http://git-wip-us.apache.org/repos/asf/phoenix/blob/015b698a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 23f6964..8192302 100644
---

phoenix git commit: PHOENIX-3148 Reduce size of PTable so that more tables can be cached in the metada cache

2016-08-23 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.1 b7eb1e309 -> 9f8499d36


PHOENIX-3148 Reduce size of PTable so that more tables can be cached in the 
metada cache


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

Branch: refs/heads/4.8-HBase-1.1
Commit: 9f8499d36b7bfb1331d7d86194e5c3c6435f6433
Parents: b7eb1e3
Author: Thomas D'Silva 
Authored: Fri Aug 19 16:39:28 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 23 22:56:43 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   1 -
 .../apache/phoenix/execute/MutationState.java   |   6 +-
 .../query/ConnectionQueryServicesImpl.java  |   5 +-
 .../query/ConnectionlessQueryServicesImpl.java  |   4 +-
 .../org/apache/phoenix/query/QueryServices.java |   2 +
 .../phoenix/query/QueryServicesOptions.java |   3 +
 .../apache/phoenix/schema/MetaDataClient.java   |  25 +-
 .../apache/phoenix/schema/PMetaDataCache.java   | 221 +++
 .../apache/phoenix/schema/PMetaDataImpl.java| 268 +++
 .../org/apache/phoenix/schema/PTableImpl.java   |  29 +-
 .../org/apache/phoenix/schema/PTableRef.java|  56 ++--
 .../apache/phoenix/schema/PTableRefFactory.java |  52 
 .../apache/phoenix/schema/PTableRefImpl.java|  39 +++
 .../phoenix/schema/SerializedPTableRef.java |  47 
 .../schema/SerializedPTableRefFactory.java  |  37 +++
 .../phoenix/schema/PMetaDataImplTest.java   |  34 ++-
 16 files changed, 532 insertions(+), 297 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f8499d3/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index c66fea3..16db876 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,7 +37,6 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
-import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f8499d3/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
index 7a9282c..e7e6aa7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
@@ -680,7 +680,7 @@ public class MutationState implements SQLCloseable {
 return Iterators.emptyIterator();
 }
 Long scn = connection.getSCN();
-final long timestamp = (tableTimestamp!=null && 
tableTimestamp!=QueryConstants.UNSET_TIMESTAMP) ? tableTimestamp : (scn == null 
? HConstants.LATEST_TIMESTAMP : scn);
+final long timestamp = getMutationTimestamp(tableTimestamp, scn);
 return new Iterator>() {
 private Map.Entry> current = iterator.next();
 private Iterator> innerIterator = 
init();
@@ -726,6 +726,10 @@ public class MutationState implements SQLCloseable {
 
 };
 }
+
+public static long getMutationTimestamp(final Long tableTimestamp, Long 
scn) {
+return (tableTimestamp!=null && 
tableTimestamp!=QueryConstants.UNSET_TIMESTAMP) ? tableTimestamp : (scn == null 
? HConstants.LATEST_TIMESTAMP : scn);
+}
 
 /**
  * Validates that the meta data is valid against the server meta data if 
we haven't yet done so.

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9f8499d3/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index fb53f4a..0e0cfbd 100644
---

phoenix git commit: PHOENIX-3148 Reduce size of PTable so that more tables can be cached in the metada cache

2016-08-23 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 b9f65dc0b -> 6e27b324b


PHOENIX-3148 Reduce size of PTable so that more tables can be cached in the 
metada cache


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

Branch: refs/heads/4.8-HBase-0.98
Commit: 6e27b324bcaf63321c551d366136b14bdb4c72ef
Parents: b9f65dc
Author: Thomas D'Silva 
Authored: Fri Aug 19 16:39:28 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 23 22:56:05 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   1 -
 .../apache/phoenix/execute/MutationState.java   |   6 +-
 .../query/ConnectionQueryServicesImpl.java  |  10 +-
 .../query/ConnectionlessQueryServicesImpl.java  |   4 +-
 .../org/apache/phoenix/query/QueryServices.java |   2 +
 .../phoenix/query/QueryServicesOptions.java |   3 +
 .../apache/phoenix/schema/MetaDataClient.java   |  25 +-
 .../apache/phoenix/schema/PMetaDataCache.java   | 221 +++
 .../apache/phoenix/schema/PMetaDataImpl.java| 268 +++
 .../org/apache/phoenix/schema/PTableImpl.java   |  29 +-
 .../org/apache/phoenix/schema/PTableRef.java|  56 ++--
 .../apache/phoenix/schema/PTableRefFactory.java |  52 
 .../apache/phoenix/schema/PTableRefImpl.java|  39 +++
 .../phoenix/schema/SerializedPTableRef.java |  47 
 .../schema/SerializedPTableRefFactory.java  |  37 +++
 .../phoenix/schema/PMetaDataImplTest.java   |  34 ++-
 16 files changed, 532 insertions(+), 302 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e27b324/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index c66fea3..16db876 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,7 +37,6 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
-import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e27b324/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
index 7e9ab4d..262f263 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
@@ -680,7 +680,7 @@ public class MutationState implements SQLCloseable {
 return Iterators.emptyIterator();
 }
 Long scn = connection.getSCN();
-final long timestamp = (tableTimestamp!=null && 
tableTimestamp!=QueryConstants.UNSET_TIMESTAMP) ? tableTimestamp : (scn == null 
? HConstants.LATEST_TIMESTAMP : scn);
+final long timestamp = getMutationTimestamp(tableTimestamp, scn);
 return new Iterator>() {
 private Map.Entry> current = iterator.next();
 private Iterator> innerIterator = 
init();
@@ -726,6 +726,10 @@ public class MutationState implements SQLCloseable {
 
 };
 }
+
+public static long getMutationTimestamp(final Long tableTimestamp, Long 
scn) {
+return (tableTimestamp!=null && 
tableTimestamp!=QueryConstants.UNSET_TIMESTAMP) ? tableTimestamp : (scn == null 
? HConstants.LATEST_TIMESTAMP : scn);
+}
 
 /**
  * Validates that the meta data is valid against the server meta data if 
we haven't yet done so.

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e27b324/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 9e4ec53..340b691 100644
---

Apache-Phoenix | 4.x-HBase-1.0 | Build Successful

2016-08-23 Thread Apache Jenkins Server 
4.x-HBase-1.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.0

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.0/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.0/lastCompletedBuild/testReport/

Changes
[jamestaylor] PHOENIX-930 duplicated columns cause query exception and drop table



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache-Phoenix | 4.x-HBase-1.0 | Build Successful

2016-08-23 Thread Apache Jenkins Server 
4.x-HBase-1.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.0

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.0/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.0/lastCompletedBuild/testReport/

Changes
[jamestaylor] PHOENIX-930 duplicated columns cause query exception and drop table



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache-Phoenix | 4.x-HBase-0.98 | Build Successful

2016-08-23 Thread Apache Jenkins Server 
4.x-HBase-0.98 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-0.98

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastCompletedBuild/testReport/

Changes
[jamestaylor] PHOENIX-930 duplicated columns cause query exception and drop table



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Jenkins build is back to normal : Phoenix | 4.x-HBase-0.98 #1272

2016-08-23 Thread Apache Jenkins Server 
See

phoenix git commit: PHOENIX-930 duplicated columns cause query exception and drop table exception (Junegunn Choi, Kalyan Hadoop)

2016-08-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 a8aa239d7 -> b9f65dc0b


PHOENIX-930 duplicated columns cause query exception and drop table exception 
(Junegunn Choi, Kalyan Hadoop)


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

Branch: refs/heads/4.8-HBase-0.98
Commit: b9f65dc0bc5192e42fb3136929e128d02bcb8bf3
Parents: a8aa239
Author: James Taylor 
Authored: Fri Aug 19 16:34:28 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 23 15:30:03 2016 -0700

--
 .../phoenix/end2end/index/IndexMetadataIT.java  | 40 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 78 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 12 +--
 .../compile/CreateTableCompilerTest.java| 47 
 4 files changed, 113 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b9f65dc0/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 1af15a1..a48cc4b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -43,6 +43,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.AmbiguousColumnException;
+import org.apache.phoenix.schema.ColumnAlreadyExistsException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
@@ -401,6 +402,45 @@ public class IndexMetadataIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 }
+
+@Test
+public void testTableWithSameColumnNames() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " int_col integer, long_col integer, int_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
+
+@Test
+public void testTableWithSameColumnNamesWithFamily() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " a.int_col integer, a.long_col integer,"
+   + " a.int_col integer, b.long_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
 
 @Test
 public void testIndexDefinitionWithSameColumnNamesInTwoFamily() throws 
Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b9f65dc0/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 1264e32..7f97f4a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -17,7 +17,6 @@
  */
 package org.apache.phoenix.schema;
 
-import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static

phoenix git commit: PHOENIX-930 duplicated columns cause query exception and drop table exception (Junegunn Choi, Kalyan Hadoop)

2016-08-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.0 506ca5f30 -> afe7f446c


PHOENIX-930 duplicated columns cause query exception and drop table exception 
(Junegunn Choi, Kalyan Hadoop)


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

Branch: refs/heads/4.8-HBase-1.0
Commit: afe7f446c570346a5b880f385f3e300f566d5b43
Parents: 506ca5f
Author: James Taylor 
Authored: Fri Aug 19 16:34:28 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 23 15:28:50 2016 -0700

--
 .../phoenix/end2end/index/IndexMetadataIT.java  | 40 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 78 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 12 +--
 .../compile/CreateTableCompilerTest.java| 47 
 4 files changed, 113 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/afe7f446/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 1af15a1..a48cc4b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -43,6 +43,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.AmbiguousColumnException;
+import org.apache.phoenix.schema.ColumnAlreadyExistsException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
@@ -401,6 +402,45 @@ public class IndexMetadataIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 }
+
+@Test
+public void testTableWithSameColumnNames() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " int_col integer, long_col integer, int_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
+
+@Test
+public void testTableWithSameColumnNamesWithFamily() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " a.int_col integer, a.long_col integer,"
+   + " a.int_col integer, b.long_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
 
 @Test
 public void testIndexDefinitionWithSameColumnNamesInTwoFamily() throws 
Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/afe7f446/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 1264e32..7f97f4a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -17,7 +17,6 @@
  */
 package org.apache.phoenix.schema;
 
-import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static

phoenix git commit: PHOENIX-930 duplicated columns cause query exception and drop table exception (Junegunn Choi, Kalyan Hadoop)

2016-08-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.1 07d6f26c3 -> b7eb1e309


PHOENIX-930 duplicated columns cause query exception and drop table exception 
(Junegunn Choi, Kalyan Hadoop)


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

Branch: refs/heads/4.8-HBase-1.1
Commit: b7eb1e3093c8a61f81d89df5af8b0871fc832a32
Parents: 07d6f26
Author: James Taylor 
Authored: Fri Aug 19 16:34:28 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 23 15:27:10 2016 -0700

--
 .../phoenix/end2end/index/IndexMetadataIT.java  | 40 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 78 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 12 +--
 .../compile/CreateTableCompilerTest.java| 47 
 4 files changed, 113 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b7eb1e30/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 1af15a1..a48cc4b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -43,6 +43,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.AmbiguousColumnException;
+import org.apache.phoenix.schema.ColumnAlreadyExistsException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
@@ -401,6 +402,45 @@ public class IndexMetadataIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 }
+
+@Test
+public void testTableWithSameColumnNames() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " int_col integer, long_col integer, int_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
+
+@Test
+public void testTableWithSameColumnNamesWithFamily() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " a.int_col integer, a.long_col integer,"
+   + " a.int_col integer, b.long_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
 
 @Test
 public void testIndexDefinitionWithSameColumnNamesInTwoFamily() throws 
Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b7eb1e30/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 1264e32..7f97f4a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -17,7 +17,6 @@
  */
 package org.apache.phoenix.schema;
 
-import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static

phoenix git commit: PHOENIX-930 duplicated columns cause query exception and drop table exception (Junegunn Choi, Kalyan Hadoop)

2016-08-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.2 2da8d9d69 -> 58cdea6bd


PHOENIX-930 duplicated columns cause query exception and drop table exception 
(Junegunn Choi, Kalyan Hadoop)


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

Branch: refs/heads/4.8-HBase-1.2
Commit: 58cdea6bd969c9401a303d487547bb13f8333ec5
Parents: 2da8d9d
Author: James Taylor 
Authored: Fri Aug 19 16:34:28 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 23 15:25:35 2016 -0700

--
 .../phoenix/end2end/index/IndexMetadataIT.java  | 40 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 78 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 12 +--
 .../compile/CreateTableCompilerTest.java| 47 
 4 files changed, 113 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/58cdea6b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 1af15a1..a48cc4b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -43,6 +43,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.AmbiguousColumnException;
+import org.apache.phoenix.schema.ColumnAlreadyExistsException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
@@ -401,6 +402,45 @@ public class IndexMetadataIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 }
+
+@Test
+public void testTableWithSameColumnNames() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " int_col integer, long_col integer, int_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
+
+@Test
+public void testTableWithSameColumnNamesWithFamily() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " a.int_col integer, a.long_col integer,"
+   + " a.int_col integer, b.long_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
 
 @Test
 public void testIndexDefinitionWithSameColumnNamesInTwoFamily() throws 
Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/58cdea6b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 1264e32..7f97f4a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -17,7 +17,6 @@
  */
 package org.apache.phoenix.schema;
 
-import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static

phoenix git commit: PHOENIX-930 duplicated columns cause query exception and drop table exception (Junegunn Choi, Kalyan Hadoop)

2016-08-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 cae2885b5 -> c662490c5


PHOENIX-930 duplicated columns cause query exception and drop table exception 
(Junegunn Choi, Kalyan Hadoop)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: c662490c5eb677bd93bec6c9fe775911865b3a5a
Parents: cae2885
Author: James Taylor 
Authored: Fri Aug 19 16:34:28 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 23 15:20:45 2016 -0700

--
 .../phoenix/end2end/index/IndexMetadataIT.java  | 40 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 78 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 12 +--
 .../compile/CreateTableCompilerTest.java| 47 
 4 files changed, 113 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c662490c/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 1af15a1..a48cc4b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -43,6 +43,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.AmbiguousColumnException;
+import org.apache.phoenix.schema.ColumnAlreadyExistsException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
@@ -401,6 +402,45 @@ public class IndexMetadataIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 }
+
+@Test
+public void testTableWithSameColumnNames() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " int_col integer, long_col integer, int_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
+
+@Test
+public void testTableWithSameColumnNamesWithFamily() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " a.int_col integer, a.long_col integer,"
+   + " a.int_col integer, b.long_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
 
 @Test
 public void testIndexDefinitionWithSameColumnNamesInTwoFamily() throws 
Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c662490c/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 1264e32..7f97f4a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -17,7 +17,6 @@
  */
 package org.apache.phoenix.schema;
 
-import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static

phoenix git commit: PHOENIX-930 duplicated columns cause query exception and drop table exception (Junegunn Choi, Kalyan Hadoop)

2016-08-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 b0adcf25e -> b283528e3


PHOENIX-930 duplicated columns cause query exception and drop table exception 
(Junegunn Choi, Kalyan Hadoop)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: b283528e30abe5f53254fa0a7f17a3f88c433c23
Parents: b0adcf2
Author: James Taylor 
Authored: Fri Aug 19 16:34:28 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 23 15:16:40 2016 -0700

--
 .../phoenix/end2end/index/IndexMetadataIT.java  | 40 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 78 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 12 +--
 .../compile/CreateTableCompilerTest.java| 47 
 4 files changed, 113 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b283528e/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 1af15a1..a48cc4b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -43,6 +43,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.AmbiguousColumnException;
+import org.apache.phoenix.schema.ColumnAlreadyExistsException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
@@ -401,6 +402,45 @@ public class IndexMetadataIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 }
+
+@Test
+public void testTableWithSameColumnNames() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " int_col integer, long_col integer, int_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
+
+@Test
+public void testTableWithSameColumnNamesWithFamily() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " a.int_col integer, a.long_col integer,"
+   + " a.int_col integer, b.long_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
 
 @Test
 public void testIndexDefinitionWithSameColumnNamesInTwoFamily() throws 
Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b283528e/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 1264e32..7f97f4a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -17,7 +17,6 @@
  */
 package org.apache.phoenix.schema;
 
-import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static

phoenix git commit: PHOENIX-930 duplicated columns cause query exception and drop table exception (Junegunn Choi, Kalyan Hadoop)

2016-08-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master 5fecde8d8 -> b36bb31fe


PHOENIX-930 duplicated columns cause query exception and drop table exception 
(Junegunn Choi, Kalyan Hadoop)


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

Branch: refs/heads/master
Commit: b36bb31fe42cb7bf5b6de5bfab63bcad424998a4
Parents: 5fecde8
Author: James Taylor 
Authored: Fri Aug 19 16:34:28 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 23 10:29:40 2016 -0700

--
 .../phoenix/end2end/index/IndexMetadataIT.java  | 40 ++
 .../apache/phoenix/schema/MetaDataClient.java   | 78 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 12 +--
 .../compile/CreateTableCompilerTest.java| 47 
 4 files changed, 113 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b36bb31f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 1af15a1..a48cc4b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -43,6 +43,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.AmbiguousColumnException;
+import org.apache.phoenix.schema.ColumnAlreadyExistsException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
@@ -401,6 +402,45 @@ public class IndexMetadataIT extends 
BaseHBaseManagedTimeIT {
 conn.close();
 }
 }
+
+@Test
+public void testTableWithSameColumnNames() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " int_col integer, long_col integer, int_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
+
+@Test
+public void testTableWithSameColumnNamesWithFamily() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(false);
+try {
+String ddl = "create table test_table (char_pk varchar not null,"
+   + " a.int_col integer, a.long_col integer,"
+   + " a.int_col integer, b.long_col integer"
+   + " constraint pk primary key (char_pk))";
+PreparedStatement stmt = conn.prepareStatement(ddl);
+stmt.execute();
+fail("Should have caught exception");
+} catch (ColumnAlreadyExistsException e) {
+assertEquals(SQLExceptionCode.COLUMN_EXIST_IN_DEF.getErrorCode(), 
e.getErrorCode());
+} finally {
+conn.close();
+}
+}
 
 @Test
 public void testIndexDefinitionWithSameColumnNamesInTwoFamily() throws 
Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b36bb31f/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 1264e32..7f97f4a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -17,7 +17,6 @@
  */
 package org.apache.phoenix.schema;
 
-import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
 import static

Build failed in Jenkins: Phoenix Compile Level Compatibility with HBase #29

2016-08-23 Thread Apache Jenkins Server 
See 

--
Started by timer
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu-1 (Ubuntu ubuntu1 yahoo-not-h2 ubuntu docker) in 
workspace 
[Phoenix_Compile_Compat_wHBase] $ /bin/bash /tmp/hudson3136509894565565543.sh
core file size  (blocks, -c) 0
data seg size   (kbytes, -d) unlimited
scheduling priority (-e) 0
file size   (blocks, -f) unlimited
pending signals (-i) 386178
max locked memory   (kbytes, -l) 64
max memory size (kbytes, -m) unlimited
open files  (-n) 6
pipe size(512 bytes, -p) 8
POSIX message queues (bytes, -q) 819200
real-time priority  (-r) 0
stack size  (kbytes, -s) 8192
cpu time   (seconds, -t) unlimited
max user processes  (-u) 10240
virtual memory  (kbytes, -v) unlimited
file locks  (-x) unlimited
core id : 0
core id : 1
core id : 10
core id : 9
physical id : 0
physical id : 1
MemTotal:   49453340 kB
MemFree: 5811720 kB
Filesystem  Size  Used Avail Use% Mounted on
udev 24G   12K   24G   1% /dev
tmpfs   4.8G  796K  4.8G   1% /run
/dev/dm-0   3.6T  643G  2.8T  19% /
none4.0K 0  4.0K   0% /sys/fs/cgroup
none5.0M 0  5.0M   0% /run/lock
none 24G 0   24G   0% /run/shm
none100M 0  100M   0% /run/user
/dev/sda2   237M  114M  111M  51% /boot
3.0.4
apache-maven-2.2.1
apache-maven-3.0.4
apache-maven-3.0.4-jenkins
apache-maven-3.0.5
apache-maven-3.2.1
apache-maven-3.2.5
apache-maven-3.3.3
apache-maven-3.3.9
latest
latest2
latest3
maven


===
Verifying compile level compatibility with HBase 0.98 with Phoenix 
4.x-HBase-0.98
===

Cloning into 'hbase'...
Switched to a new branch '0.98'
Branch 0.98 set up to track remote branch 0.98 from origin.

main:
 [exec] 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common
 [exec] 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common

main:
[mkdir] Created dir: 

 [exec] tar: hadoop-snappy-nativelibs.tar: Cannot open: No such file or 
directory
 [exec] tar: Error is not recoverable: exiting now
 [exec] Result: 2

main:
[mkdir] Created dir: 

 [copy] Copying 20 files to 

[mkdir] Created dir: 

[mkdir] Created dir: 


main:
[mkdir] Created dir: 

 [copy] Copying 17 files to 

[mkdir] Created dir: 


main:
[mkdir] Created dir: 

 [copy] Copying 1 file to 

[mkdir] Created dir: 


HBase pom.xml:

Got HBase version as 0.98.22-SNAPSHOT
Cloning into 'phoenix'...
Switched to a new branch '4.x-HBase-0.98'
Branch 4.x-HBase-0.98 set up to track remote branch 4.x-HBase-0.98 from origin.
ANTLR Parser Generator  Version 3.5.2
Output file 

 does not exist: must build 

PhoenixSQL.g


===
Verifying compile level compatibility with HBase branch-1.2 with Phoenix master

Build failed in Jenkins: Phoenix | Master #1367

2016-08-23 Thread Apache Jenkins Server 
See 

Changes:

[larsh] PHOENIX-3195 Addendum. (James Taylor)

--
[...truncated 328 lines...]
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec - in 
org.apache.phoenix.util.QueryUtilTest
Running org.apache.phoenix.util.IndexUtilTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.util.IndexUtilTest
Running org.apache.phoenix.util.LikeExpressionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in 
org.apache.phoenix.util.LikeExpressionTest
Running org.apache.phoenix.util.PhoenixContextExecutorTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in 
org.apache.phoenix.util.PhoenixContextExecutorTest
Running org.apache.phoenix.index.IndexMaintainerTest
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.878 sec - in 
org.apache.phoenix.util.PhoenixRuntimeTest
Running org.apache.phoenix.index.automated.MRJobSubmitterTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.16 sec - in 
org.apache.phoenix.index.automated.MRJobSubmitterTest
Running org.apache.phoenix.trace.TraceMetricsSourceTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.558 sec - in 
org.apache.phoenix.util.PhoenixEncodeDecodeTest
Running org.apache.phoenix.memory.MemoryManagerTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 3, Time elapsed: 0.102 sec - in 
org.apache.phoenix.memory.MemoryManagerTest
Running org.apache.phoenix.cache.TenantCacheTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.021 sec - in 
org.apache.phoenix.cache.TenantCacheTest
Running org.apache.phoenix.cache.JodaTimezoneCacheTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 sec - in 
org.apache.phoenix.cache.JodaTimezoneCacheTest
Running org.apache.phoenix.compile.WhereOptimizerTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.589 sec - in 
org.apache.phoenix.trace.TraceMetricsSourceTest
Running org.apache.phoenix.compile.SelectStatementRewriterTest
Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.95 sec - in 
org.apache.phoenix.index.IndexMaintainerTest
Running org.apache.phoenix.compile.ViewCompilerTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.197 sec - in 
org.apache.phoenix.compile.SelectStatementRewriterTest
Running org.apache.phoenix.compile.LimitCompilerTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.226 sec - in 
org.apache.phoenix.compile.LimitCompilerTest
Running org.apache.phoenix.compile.QueryOptimizerTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.532 sec - in 
org.apache.phoenix.compile.ViewCompilerTest
Running org.apache.phoenix.compile.QueryMetaDataTest
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.384 sec - in 
org.apache.phoenix.compile.QueryMetaDataTest
Running org.apache.phoenix.compile.ScanRangesTest
Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.05 sec - in 
org.apache.phoenix.compile.ScanRangesTest
Running org.apache.phoenix.compile.JoinQueryCompilerTest
Tests run: 105, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.443 sec - 
in org.apache.phoenix.compile.WhereOptimizerTest
Running org.apache.phoenix.compile.HavingCompilerTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.31 sec - in 
org.apache.phoenix.compile.JoinQueryCompilerTest
Running org.apache.phoenix.compile.TenantSpecificViewIndexCompileTest
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.48 sec - in 
org.apache.phoenix.compile.HavingCompilerTest
Running org.apache.phoenix.compile.StatementHintsCompilationTest
Tests run: 42, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.539 sec - in 
org.apache.phoenix.compile.QueryOptimizerTest
Running org.apache.phoenix.compile.WhereCompilerTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.585 sec - in 
org.apache.phoenix.compile.TenantSpecificViewIndexCompileTest
Running org.apache.phoenix.compile.SaltedScanRangesTest
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec - in 
org.apache.phoenix.compile.SaltedScanRangesTest
Running org.apache.phoenix.compile.QueryCompilerTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.785 sec - in 
org.apache.phoenix.compile.StatementHintsCompilationTest
Running org.apache.phoenix.compile.ScanRangesIntersectTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.compile.ScanRangesIntersectTest
Running org.apache.phoenix.parse.BuiltInFunctionInfoTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec - in 
org.apache.phoenix.parse.BuiltInFunctionInfoTest
Running org.apache.phoenix.parse.CastParseNodeTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time