phoenix git commit: PHOENIX-2596 Asynchronous Local Index is not available(Rajeshbabu)

2016-06-07 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 b775ce7da -> 9bf4df0c7


PHOENIX-2596 Asynchronous Local Index is not available(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 9bf4df0c7d96add08a04dd71693c65004bf5f382
Parents: b775ce7
Author: Rajeshbabu Chintaguntla 
Authored: Tue Jun 7 12:13:32 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Tue Jun 7 12:13:32 2016 +0530

--
 .../phoenix/mapreduce/AbstractBulkLoadTool.java | 21 ++--
 .../phoenix/mapreduce/index/IndexTool.java  |  4 ++--
 .../org/apache/phoenix/util/SchemaUtil.java | 16 +++
 .../phoenix/mapreduce/BulkLoadToolTest.java |  5 +++--
 4 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9bf4df0c/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index 0525de9..faf20db 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -183,10 +183,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 String tableName = cmdLine.getOptionValue(TABLE_NAME_OPT.getOpt());
 String schemaName = cmdLine.getOptionValue(SCHEMA_NAME_OPT.getOpt());
 String indexTableName = 
cmdLine.getOptionValue(INDEX_TABLE_NAME_OPT.getOpt());
-String qualifiedTableName = getQualifiedTableName(schemaName, 
tableName);
+String qualifiedTableName = 
SchemaUtil.getQualifiedTableName(schemaName, tableName);
 String qualifiedIndexTableName = null;
 if (indexTableName != null){
-qualifiedIndexTableName = getQualifiedTableName(schemaName, 
indexTableName);
+qualifiedIndexTableName = 
SchemaUtil.getQualifiedTableName(schemaName, indexTableName);
 }
 
 if (cmdLine.hasOption(ZK_QUORUM_OPT.getOpt())) {
@@ -342,23 +342,6 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 }
 
 /**
- * Calculate the HBase HTable name for which the import is to be done.
- *
- * @param schemaName import schema name, can be null
- * @param tableName import table name
- * @return the byte representation of the import HTable
- */
-@VisibleForTesting
-static String getQualifiedTableName(String schemaName, String tableName) {
-if (schemaName != null) {
-return String.format("%s.%s", 
SchemaUtil.normalizeIdentifier(schemaName),
-SchemaUtil.normalizeIdentifier(tableName));
-} else {
-return SchemaUtil.normalizeIdentifier(tableName);
-}
-}
-
-/**
  * Perform any required validation on the table being bulk loaded into:
  * - ensure no column family names start with '_', as they'd be ignored 
leading to problems.
  * @throws java.sql.SQLException

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9bf4df0c/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 6743688..fc1292a 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
@@ -181,8 +181,8 @@ public class IndexTool extends Configured implements Tool {
 final String schemaName = 
cmdLine.getOptionValue(SCHEMA_NAME_OPTION.getOpt());
 final String dataTable = 
cmdLine.getOptionValue(DATA_TABLE_OPTION.getOpt());
 final String indexTable = 
cmdLine.getOptionValue(INDEX_TABLE_OPTION.getOpt());
-final String qDataTable = SchemaUtil.getTableName(schemaName, 
dataTable);
-final String qIndexTable = SchemaUtil.getTableName(schemaName, 
indexTable);
+final String qDataTable = 
SchemaUtil.getQualifiedTableName(schemaName, dataTable);
+final String qIndexTable = 
SchemaUtil.getQualifiedTableName(schemaName, indexTable);
 
 connection =

phoenix git commit: PHOENIX-2596 Asynchronous Local Index is not available(Rajeshbabu)

2016-06-07 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 eaf3eed87 -> 9b8f27403


PHOENIX-2596 Asynchronous Local Index is not available(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 9b8f2740385680ed95565ec8a94877dc97dd7298
Parents: eaf3eed
Author: Rajeshbabu Chintaguntla 
Authored: Tue Jun 7 12:12:57 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Tue Jun 7 12:12:57 2016 +0530

--
 .../phoenix/mapreduce/AbstractBulkLoadTool.java | 21 ++--
 .../phoenix/mapreduce/index/IndexTool.java  |  4 ++--
 .../org/apache/phoenix/util/SchemaUtil.java | 16 +++
 .../phoenix/mapreduce/BulkLoadToolTest.java |  5 +++--
 4 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9b8f2740/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index 0525de9..faf20db 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -183,10 +183,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 String tableName = cmdLine.getOptionValue(TABLE_NAME_OPT.getOpt());
 String schemaName = cmdLine.getOptionValue(SCHEMA_NAME_OPT.getOpt());
 String indexTableName = 
cmdLine.getOptionValue(INDEX_TABLE_NAME_OPT.getOpt());
-String qualifiedTableName = getQualifiedTableName(schemaName, 
tableName);
+String qualifiedTableName = 
SchemaUtil.getQualifiedTableName(schemaName, tableName);
 String qualifiedIndexTableName = null;
 if (indexTableName != null){
-qualifiedIndexTableName = getQualifiedTableName(schemaName, 
indexTableName);
+qualifiedIndexTableName = 
SchemaUtil.getQualifiedTableName(schemaName, indexTableName);
 }
 
 if (cmdLine.hasOption(ZK_QUORUM_OPT.getOpt())) {
@@ -342,23 +342,6 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 }
 
 /**
- * Calculate the HBase HTable name for which the import is to be done.
- *
- * @param schemaName import schema name, can be null
- * @param tableName import table name
- * @return the byte representation of the import HTable
- */
-@VisibleForTesting
-static String getQualifiedTableName(String schemaName, String tableName) {
-if (schemaName != null) {
-return String.format("%s.%s", 
SchemaUtil.normalizeIdentifier(schemaName),
-SchemaUtil.normalizeIdentifier(tableName));
-} else {
-return SchemaUtil.normalizeIdentifier(tableName);
-}
-}
-
-/**
  * Perform any required validation on the table being bulk loaded into:
  * - ensure no column family names start with '_', as they'd be ignored 
leading to problems.
  * @throws java.sql.SQLException

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9b8f2740/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 6743688..fc1292a 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
@@ -181,8 +181,8 @@ public class IndexTool extends Configured implements Tool {
 final String schemaName = 
cmdLine.getOptionValue(SCHEMA_NAME_OPTION.getOpt());
 final String dataTable = 
cmdLine.getOptionValue(DATA_TABLE_OPTION.getOpt());
 final String indexTable = 
cmdLine.getOptionValue(INDEX_TABLE_OPTION.getOpt());
-final String qDataTable = SchemaUtil.getTableName(schemaName, 
dataTable);
-final String qIndexTable = SchemaUtil.getTableName(schemaName, 
indexTable);
+final String qDataTable = 
SchemaUtil.getQualifiedTableName(schemaName, dataTable);
+final String qIndexTable = 
SchemaUtil.getQualifiedTableName(schemaName, indexTable);
 
 connection =

phoenix git commit: PHOENIX-2596 Asynchronous Local Index is not available(Rajeshbabu)

2016-06-07 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 f00860aac -> f12c196a7


PHOENIX-2596 Asynchronous Local Index is not available(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: f12c196a71be1cc99aca396c77f080c0ecb51b5d
Parents: f00860a
Author: Rajeshbabu Chintaguntla 
Authored: Tue Jun 7 12:12:25 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Tue Jun 7 12:12:25 2016 +0530

--
 .../phoenix/mapreduce/AbstractBulkLoadTool.java | 21 ++--
 .../phoenix/mapreduce/index/IndexTool.java  |  4 ++--
 .../org/apache/phoenix/util/SchemaUtil.java | 16 +++
 .../phoenix/mapreduce/BulkLoadToolTest.java |  5 +++--
 4 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f12c196a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index 0525de9..faf20db 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -183,10 +183,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 String tableName = cmdLine.getOptionValue(TABLE_NAME_OPT.getOpt());
 String schemaName = cmdLine.getOptionValue(SCHEMA_NAME_OPT.getOpt());
 String indexTableName = 
cmdLine.getOptionValue(INDEX_TABLE_NAME_OPT.getOpt());
-String qualifiedTableName = getQualifiedTableName(schemaName, 
tableName);
+String qualifiedTableName = 
SchemaUtil.getQualifiedTableName(schemaName, tableName);
 String qualifiedIndexTableName = null;
 if (indexTableName != null){
-qualifiedIndexTableName = getQualifiedTableName(schemaName, 
indexTableName);
+qualifiedIndexTableName = 
SchemaUtil.getQualifiedTableName(schemaName, indexTableName);
 }
 
 if (cmdLine.hasOption(ZK_QUORUM_OPT.getOpt())) {
@@ -342,23 +342,6 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 }
 
 /**
- * Calculate the HBase HTable name for which the import is to be done.
- *
- * @param schemaName import schema name, can be null
- * @param tableName import table name
- * @return the byte representation of the import HTable
- */
-@VisibleForTesting
-static String getQualifiedTableName(String schemaName, String tableName) {
-if (schemaName != null) {
-return String.format("%s.%s", 
SchemaUtil.normalizeIdentifier(schemaName),
-SchemaUtil.normalizeIdentifier(tableName));
-} else {
-return SchemaUtil.normalizeIdentifier(tableName);
-}
-}
-
-/**
  * Perform any required validation on the table being bulk loaded into:
  * - ensure no column family names start with '_', as they'd be ignored 
leading to problems.
  * @throws java.sql.SQLException

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f12c196a/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 6743688..fc1292a 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
@@ -181,8 +181,8 @@ public class IndexTool extends Configured implements Tool {
 final String schemaName = 
cmdLine.getOptionValue(SCHEMA_NAME_OPTION.getOpt());
 final String dataTable = 
cmdLine.getOptionValue(DATA_TABLE_OPTION.getOpt());
 final String indexTable = 
cmdLine.getOptionValue(INDEX_TABLE_OPTION.getOpt());
-final String qDataTable = SchemaUtil.getTableName(schemaName, 
dataTable);
-final String qIndexTable = SchemaUtil.getTableName(schemaName, 
indexTable);
+final String qDataTable = 
SchemaUtil.getQualifiedTableName(schemaName, dataTable);
+final String qIndexTable = 
SchemaUtil.getQualifiedTableName(schemaName, indexTable);
 
 connection =

phoenix git commit: PHOENIX-2596 Asynchronous Local Index is not available(Rajeshbabu)

2016-06-07 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/master cfe8d4d96 -> 6ca3a6e2c


PHOENIX-2596 Asynchronous Local Index is not available(Rajeshbabu)


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

Branch: refs/heads/master
Commit: 6ca3a6e2c5e93cc1bd75659479c89bced70fb36f
Parents: cfe8d4d
Author: Rajeshbabu Chintaguntla 
Authored: Tue Jun 7 12:10:36 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Tue Jun 7 12:10:36 2016 +0530

--
 .../phoenix/mapreduce/AbstractBulkLoadTool.java | 21 ++--
 .../phoenix/mapreduce/index/IndexTool.java  |  4 ++--
 .../org/apache/phoenix/util/SchemaUtil.java | 16 +++
 .../phoenix/mapreduce/BulkLoadToolTest.java |  5 +++--
 4 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ca3a6e2/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index 41c39a3..ad1b691 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -183,10 +183,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 String tableName = cmdLine.getOptionValue(TABLE_NAME_OPT.getOpt());
 String schemaName = cmdLine.getOptionValue(SCHEMA_NAME_OPT.getOpt());
 String indexTableName = 
cmdLine.getOptionValue(INDEX_TABLE_NAME_OPT.getOpt());
-String qualifiedTableName = getQualifiedTableName(schemaName, 
tableName);
+String qualifiedTableName = 
SchemaUtil.getQualifiedTableName(schemaName, tableName);
 String qualifiedIndexTableName = null;
 if (indexTableName != null){
-qualifiedIndexTableName = getQualifiedTableName(schemaName, 
indexTableName);
+qualifiedIndexTableName = 
SchemaUtil.getQualifiedTableName(schemaName, indexTableName);
 }
 
 if (cmdLine.hasOption(ZK_QUORUM_OPT.getOpt())) {
@@ -342,23 +342,6 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 }
 
 /**
- * Calculate the HBase HTable name for which the import is to be done.
- *
- * @param schemaName import schema name, can be null
- * @param tableName import table name
- * @return the byte representation of the import HTable
- */
-@VisibleForTesting
-static String getQualifiedTableName(String schemaName, String tableName) {
-if (schemaName != null) {
-return String.format("%s.%s", 
SchemaUtil.normalizeIdentifier(schemaName),
-SchemaUtil.normalizeIdentifier(tableName));
-} else {
-return SchemaUtil.normalizeIdentifier(tableName);
-}
-}
-
-/**
  * Perform any required validation on the table being bulk loaded into:
  * - ensure no column family names start with '_', as they'd be ignored 
leading to problems.
  * @throws java.sql.SQLException

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ca3a6e2/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 c93a58b..db8aba9 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
@@ -181,8 +181,8 @@ public class IndexTool extends Configured implements Tool {
 final String schemaName = 
cmdLine.getOptionValue(SCHEMA_NAME_OPTION.getOpt());
 final String dataTable = 
cmdLine.getOptionValue(DATA_TABLE_OPTION.getOpt());
 final String indexTable = 
cmdLine.getOptionValue(INDEX_TABLE_OPTION.getOpt());
-final String qDataTable = SchemaUtil.getTableName(schemaName, 
dataTable);
-final String qIndexTable = SchemaUtil.getTableName(schemaName, 
indexTable);
+final String qDataTable = 
SchemaUtil.getQualifiedTableName(schemaName, dataTable);
+final String qIndexTable = 
SchemaUtil.getQualifiedTableName(schemaName, indexTable);
 
 connection =