You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2015/07/20 19:14:44 UTC
[14/50] [abbrv] phoenix git commit: PHOENIX-2058 Check for existence
and compatibility of columns being added in view
PHOENIX-2058 Check for existence and compatibility of columns being added in view
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/aa4c9003
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/aa4c9003
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/aa4c9003
Branch: refs/heads/calcite
Commit: aa4c9003d4bd4827718e0f37de8c270f94fd5694
Parents: 8c9a6b8
Author: Thomas D'Silva <td...@salesforce.com>
Authored: Wed Jul 8 15:54:17 2015 -0700
Committer: Thomas D'Silva <td...@salesforce.com>
Committed: Wed Jul 8 15:54:17 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/phoenix/schema/MetaDataClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/aa4c9003/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 8a1c14b..d2d4338 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
@@ -2204,7 +2204,7 @@ public class MetaDataClient {
String familyName = null;
String msg = null;
// TODO: better to return error code
- if (result.getColumnName() != null && result.getColumnName() != null) {
+ if (result.getColumnName() != null) {
familyName = result.getFamilyName() == null ? null : Bytes.toString(result.getFamilyName());
columnName = Bytes.toString(result.getColumnName());
msg = "Cannot add/drop column referenced by VIEW";