phoenix git commit: Some phoenix-spark IT tests are broken after PHOENIX-2862

2016-05-20 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 626c26ac7 -> e3807d29c


Some phoenix-spark IT tests are broken after PHOENIX-2862


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

Branch: refs/heads/4.x-HBase-1.1
Commit: e3807d29c0f585e5a5326dfcf70ed6bc21347fbd
Parents: 626c26a
Author: Ankit Singhal 
Authored: Sat May 21 09:45:14 2016 +0530
Committer: Ankit Singhal 
Committed: Sat May 21 09:45:14 2016 +0530

--
 .../main/java/org/apache/phoenix/mapreduce/index/IndexTool.java  | 2 +-
 .../src/main/java/org/apache/phoenix/util/SchemaUtil.java| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e3807d29/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
index 34694c6..6743688 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
@@ -358,7 +358,7 @@ public class IndexTool extends Configured implements Tool {
 final String indexTable) throws SQLException {
 final DatabaseMetaData dbMetaData = connection.getMetaData();
 final String schemaName = 
SchemaUtil.getSchemaNameFromFullName(masterTable);
-final String tableName = 
SchemaUtil.getTableNameFromFullName(masterTable);
+final String tableName = 
SchemaUtil.normalizeIdentifier(SchemaUtil.getTableNameFromFullName(masterTable));
 
 ResultSet rs = null;
 try {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e3807d29/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
index cb1ef47..41e5704 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
@@ -641,7 +641,7 @@ public class SchemaUtil {
 if (tableName == null) {
 return null;
 }
-if (isExistingTableMappedToPhoenixName(Bytes.toString(tableName))) { 
return normalizeIdentifier(Bytes.toString(tableName)); }
+if (isExistingTableMappedToPhoenixName(Bytes.toString(tableName))) { 
return Bytes.toString(tableName); }
 int index = indexOf(tableName, QueryConstants.NAME_SEPARATOR_BYTE);
 if (index < 0) {
 index = indexOf(tableName, 
QueryConstants.NAMESPACE_SEPARATOR_BYTE);
@@ -651,7 +651,7 @@ public class SchemaUtil {
 }
 
 public static String getTableNameFromFullName(String tableName) {
-if (isExistingTableMappedToPhoenixName(tableName)) { return 
normalizeIdentifier(tableName); }
+if (isExistingTableMappedToPhoenixName(tableName)) { return tableName; 
}
 if (tableName.contains(QueryConstants.NAMESPACE_SEPARATOR)) { return 
getTableNameFromFullName(tableName,
 QueryConstants.NAMESPACE_SEPARATOR); }
 return getTableNameFromFullName(tableName, 
QueryConstants.NAME_SEPARATOR);

phoenix git commit: Some phoenix-spark IT tests are broken after PHOENIX-2862

2016-05-20 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 a05137b2f -> 0785d3d18


Some phoenix-spark IT tests are broken after PHOENIX-2862


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 0785d3d1899b7fc4fc4f8c65138ecf5a415f84a7
Parents: a05137b
Author: Ankit Singhal 
Authored: Sat May 21 09:44:42 2016 +0530
Committer: Ankit Singhal 
Committed: Sat May 21 09:44:42 2016 +0530

--
 .../main/java/org/apache/phoenix/mapreduce/index/IndexTool.java  | 2 +-
 .../src/main/java/org/apache/phoenix/util/SchemaUtil.java| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0785d3d1/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
index 34694c6..6743688 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
@@ -358,7 +358,7 @@ public class IndexTool extends Configured implements Tool {
 final String indexTable) throws SQLException {
 final DatabaseMetaData dbMetaData = connection.getMetaData();
 final String schemaName = 
SchemaUtil.getSchemaNameFromFullName(masterTable);
-final String tableName = 
SchemaUtil.getTableNameFromFullName(masterTable);
+final String tableName = 
SchemaUtil.normalizeIdentifier(SchemaUtil.getTableNameFromFullName(masterTable));
 
 ResultSet rs = null;
 try {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0785d3d1/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
index cb1ef47..41e5704 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
@@ -641,7 +641,7 @@ public class SchemaUtil {
 if (tableName == null) {
 return null;
 }
-if (isExistingTableMappedToPhoenixName(Bytes.toString(tableName))) { 
return normalizeIdentifier(Bytes.toString(tableName)); }
+if (isExistingTableMappedToPhoenixName(Bytes.toString(tableName))) { 
return Bytes.toString(tableName); }
 int index = indexOf(tableName, QueryConstants.NAME_SEPARATOR_BYTE);
 if (index < 0) {
 index = indexOf(tableName, 
QueryConstants.NAMESPACE_SEPARATOR_BYTE);
@@ -651,7 +651,7 @@ public class SchemaUtil {
 }
 
 public static String getTableNameFromFullName(String tableName) {
-if (isExistingTableMappedToPhoenixName(tableName)) { return 
normalizeIdentifier(tableName); }
+if (isExistingTableMappedToPhoenixName(tableName)) { return tableName; 
}
 if (tableName.contains(QueryConstants.NAMESPACE_SEPARATOR)) { return 
getTableNameFromFullName(tableName,
 QueryConstants.NAMESPACE_SEPARATOR); }
 return getTableNameFromFullName(tableName, 
QueryConstants.NAME_SEPARATOR);

phoenix git commit: Some phoenix-spark IT tests are broken after PHOENIX-2862

2016-05-20 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 7cbb2b9ea -> eb93526ce


Some phoenix-spark IT tests are broken after PHOENIX-2862


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

Branch: refs/heads/4.x-HBase-0.98
Commit: eb93526ce009c677c0e75e7a88cde4ee00bb2cd0
Parents: 7cbb2b9
Author: Ankit Singhal 
Authored: Sat May 21 09:44:16 2016 +0530
Committer: Ankit Singhal 
Committed: Sat May 21 09:44:16 2016 +0530

--
 .../main/java/org/apache/phoenix/mapreduce/index/IndexTool.java  | 2 +-
 .../src/main/java/org/apache/phoenix/util/SchemaUtil.java| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb93526c/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
index 34694c6..6743688 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
@@ -358,7 +358,7 @@ public class IndexTool extends Configured implements Tool {
 final String indexTable) throws SQLException {
 final DatabaseMetaData dbMetaData = connection.getMetaData();
 final String schemaName = 
SchemaUtil.getSchemaNameFromFullName(masterTable);
-final String tableName = 
SchemaUtil.getTableNameFromFullName(masterTable);
+final String tableName = 
SchemaUtil.normalizeIdentifier(SchemaUtil.getTableNameFromFullName(masterTable));
 
 ResultSet rs = null;
 try {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb93526c/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
index cb1ef47..41e5704 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
@@ -641,7 +641,7 @@ public class SchemaUtil {
 if (tableName == null) {
 return null;
 }
-if (isExistingTableMappedToPhoenixName(Bytes.toString(tableName))) { 
return normalizeIdentifier(Bytes.toString(tableName)); }
+if (isExistingTableMappedToPhoenixName(Bytes.toString(tableName))) { 
return Bytes.toString(tableName); }
 int index = indexOf(tableName, QueryConstants.NAME_SEPARATOR_BYTE);
 if (index < 0) {
 index = indexOf(tableName, 
QueryConstants.NAMESPACE_SEPARATOR_BYTE);
@@ -651,7 +651,7 @@ public class SchemaUtil {
 }
 
 public static String getTableNameFromFullName(String tableName) {
-if (isExistingTableMappedToPhoenixName(tableName)) { return 
normalizeIdentifier(tableName); }
+if (isExistingTableMappedToPhoenixName(tableName)) { return tableName; 
}
 if (tableName.contains(QueryConstants.NAMESPACE_SEPARATOR)) { return 
getTableNameFromFullName(tableName,
 QueryConstants.NAMESPACE_SEPARATOR); }
 return getTableNameFromFullName(tableName, 
QueryConstants.NAME_SEPARATOR);

phoenix git commit: Some phoenix-spark IT tests are broken after PHOENIX-2862

2016-05-20 Thread ankit 
Repository: phoenix
Updated Branches:
  refs/heads/master 01405d5d6 -> b20cb245a


Some phoenix-spark IT tests are broken after PHOENIX-2862


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

Branch: refs/heads/master
Commit: b20cb245a4c3a7994eb3562a7855c9464f84f40d
Parents: 01405d5
Author: Ankit Singhal 
Authored: Sat May 21 09:43:19 2016 +0530
Committer: Ankit Singhal 
Committed: Sat May 21 09:43:19 2016 +0530

--
 .../main/java/org/apache/phoenix/mapreduce/index/IndexTool.java  | 2 +-
 .../src/main/java/org/apache/phoenix/util/SchemaUtil.java| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b20cb245/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
index 34694c6..6743688 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
@@ -358,7 +358,7 @@ public class IndexTool extends Configured implements Tool {
 final String indexTable) throws SQLException {
 final DatabaseMetaData dbMetaData = connection.getMetaData();
 final String schemaName = 
SchemaUtil.getSchemaNameFromFullName(masterTable);
-final String tableName = 
SchemaUtil.getTableNameFromFullName(masterTable);
+final String tableName = 
SchemaUtil.normalizeIdentifier(SchemaUtil.getTableNameFromFullName(masterTable));
 
 ResultSet rs = null;
 try {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b20cb245/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
index cb1ef47..41e5704 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
@@ -641,7 +641,7 @@ public class SchemaUtil {
 if (tableName == null) {
 return null;
 }
-if (isExistingTableMappedToPhoenixName(Bytes.toString(tableName))) { 
return normalizeIdentifier(Bytes.toString(tableName)); }
+if (isExistingTableMappedToPhoenixName(Bytes.toString(tableName))) { 
return Bytes.toString(tableName); }
 int index = indexOf(tableName, QueryConstants.NAME_SEPARATOR_BYTE);
 if (index < 0) {
 index = indexOf(tableName, 
QueryConstants.NAMESPACE_SEPARATOR_BYTE);
@@ -651,7 +651,7 @@ public class SchemaUtil {
 }
 
 public static String getTableNameFromFullName(String tableName) {
-if (isExistingTableMappedToPhoenixName(tableName)) { return 
normalizeIdentifier(tableName); }
+if (isExistingTableMappedToPhoenixName(tableName)) { return tableName; 
}
 if (tableName.contains(QueryConstants.NAMESPACE_SEPARATOR)) { return 
getTableNameFromFullName(tableName,
 QueryConstants.NAMESPACE_SEPARATOR); }
 return getTableNameFromFullName(tableName, 
QueryConstants.NAME_SEPARATOR);