[46/50] ambari git commit: AMBARI-20181 : hive view 2.0 : added back ticks in column names to support all unicode chars (nitirajrathore)

2017-03-01 Thread ncole
AMBARI-20181 : hive view 2.0 : added back ticks in column names to support all 
unicode chars (nitirajrathore)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d562216ed7784fd5898668b17ddf80abdbf642b1
Parents: a749f97
Author: Nitiraj Singh Rathore 
Authored: Wed Mar 1 23:39:55 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Wed Mar 1 23:39:55 2017 +0530

--
 .../view/hive20/internal/dto/ColumnInfo.java| 19 --
 .../generators/CreateTableQueryGenerator.java   |  9 ++-
 .../generators/InsertFromQueryGenerator.java|  6 +-
 .../CreateTableQueryGeneratorTest.java  | 11 +++-
 .../InsertFromQueryGeneratorSpecTest.groovy | 66 
 5 files changed, 99 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d562216e/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
index 9f179d1..e5cd540 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
@@ -45,14 +45,23 @@ public class ColumnInfo {
   }
 
   public ColumnInfo(String name, String type, String comment) {
-this.name = name;
-this.type = type;
-this.comment = comment;
+this(name, type, null, null, comment);
+  }
+
+  public ColumnInfo(String name, String type, Integer precision, String 
comment) {
+this(name, type, precision, null, comment);
+  }
+
+  public ColumnInfo(String name, String type, Integer precision, Integer 
scale) {
+this(name, type, precision, scale, null);
+  }
+
+  public ColumnInfo(String name, String type, Integer precision) {
+this(name, type, precision, null, null);
   }
 
   public ColumnInfo(String name, String type) {
-this.name = name;
-this.type = type;
+this(name, type, null, null, null);
   }
 
   public String getName() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/d562216e/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
index eab3a4b..774075d 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
@@ -48,13 +48,16 @@ public class CreateTableQueryGenerator implements 
QueryGenerator{
   public Optional getQuery(){
 StringBuffer query = new StringBuffer();
 query.append("CREATE TABLE ");
-query.append(tableMeta.getDatabase()).append(".");
-query.append(tableMeta.getTable()).append(" ");
+query.append("`").append(tableMeta.getDatabase()).append("`").append(".");
+query.append("`").append(tableMeta.getTable()).append("`").append(" ");
 query.append("(").append(getColumnQuery(tableMeta.getColumns())).append(") 
");
 if(null != tableMeta.getDetailedInfo() && null != 
tableMeta.getDetailedInfo().getParameters()){
   String tableComment = 
tableMeta.getDetailedInfo().getParameters().get(COMMENT);
   if(!Strings.isNullOrEmpty(tableComment)){
-query.append(" COMMENT ").append(tableComment);
+tableComment = 
tableMeta.getDetailedInfo().getParameters().get(COMMENT.toLowerCase());
+if(!Strings.isNullOrEmpty(tableComment)) {
+  query.append(" COMMENT ").append(tableComment);
+}
   }
 }
 if(null != tableMeta.getPartitionInfo() ) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/d562216e/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java
 

ambari git commit: AMBARI-20181 : hive view 2.0 : added back ticks in column names to support all unicode chars (nitirajrathore)

2017-03-01 Thread nitiraj
Repository: ambari
Updated Branches:
  refs/heads/trunk a749f97ab -> d562216ed


AMBARI-20181 : hive view 2.0 : added back ticks in column names to support all 
unicode chars (nitirajrathore)


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

Branch: refs/heads/trunk
Commit: d562216ed7784fd5898668b17ddf80abdbf642b1
Parents: a749f97
Author: Nitiraj Singh Rathore 
Authored: Wed Mar 1 23:39:55 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Wed Mar 1 23:39:55 2017 +0530

--
 .../view/hive20/internal/dto/ColumnInfo.java| 19 --
 .../generators/CreateTableQueryGenerator.java   |  9 ++-
 .../generators/InsertFromQueryGenerator.java|  6 +-
 .../CreateTableQueryGeneratorTest.java  | 11 +++-
 .../InsertFromQueryGeneratorSpecTest.groovy | 66 
 5 files changed, 99 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d562216e/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
index 9f179d1..e5cd540 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
@@ -45,14 +45,23 @@ public class ColumnInfo {
   }
 
   public ColumnInfo(String name, String type, String comment) {
-this.name = name;
-this.type = type;
-this.comment = comment;
+this(name, type, null, null, comment);
+  }
+
+  public ColumnInfo(String name, String type, Integer precision, String 
comment) {
+this(name, type, precision, null, comment);
+  }
+
+  public ColumnInfo(String name, String type, Integer precision, Integer 
scale) {
+this(name, type, precision, scale, null);
+  }
+
+  public ColumnInfo(String name, String type, Integer precision) {
+this(name, type, precision, null, null);
   }
 
   public ColumnInfo(String name, String type) {
-this.name = name;
-this.type = type;
+this(name, type, null, null, null);
   }
 
   public String getName() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/d562216e/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
index eab3a4b..774075d 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
@@ -48,13 +48,16 @@ public class CreateTableQueryGenerator implements 
QueryGenerator{
   public Optional getQuery(){
 StringBuffer query = new StringBuffer();
 query.append("CREATE TABLE ");
-query.append(tableMeta.getDatabase()).append(".");
-query.append(tableMeta.getTable()).append(" ");
+query.append("`").append(tableMeta.getDatabase()).append("`").append(".");
+query.append("`").append(tableMeta.getTable()).append("`").append(" ");
 query.append("(").append(getColumnQuery(tableMeta.getColumns())).append(") 
");
 if(null != tableMeta.getDetailedInfo() && null != 
tableMeta.getDetailedInfo().getParameters()){
   String tableComment = 
tableMeta.getDetailedInfo().getParameters().get(COMMENT);
   if(!Strings.isNullOrEmpty(tableComment)){
-query.append(" COMMENT ").append(tableComment);
+tableComment = 
tableMeta.getDetailedInfo().getParameters().get(COMMENT.toLowerCase());
+if(!Strings.isNullOrEmpty(tableComment)) {
+  query.append(" COMMENT ").append(tableComment);
+}
   }
 }
 if(null != tableMeta.getPartitionInfo() ) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/d562216e/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java
--
diff --git 

ambari git commit: AMBARI-20181 : hive view 2.0 : added back ticks in column names to support all unicode chars (nitirajrathore)

2017-03-01 Thread nitiraj
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 90f0d2560 -> 1546cc9df


AMBARI-20181 : hive view 2.0 : added back ticks in column names to support all 
unicode chars (nitirajrathore)


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

Branch: refs/heads/branch-2.5
Commit: 1546cc9df66cc06087b0402bd572fb23f08bdb52
Parents: 90f0d25
Author: Nitiraj Singh Rathore 
Authored: Wed Mar 1 23:39:55 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Wed Mar 1 23:40:28 2017 +0530

--
 .../view/hive20/internal/dto/ColumnInfo.java| 19 --
 .../generators/CreateTableQueryGenerator.java   |  9 ++-
 .../generators/InsertFromQueryGenerator.java|  6 +-
 .../CreateTableQueryGeneratorTest.java  | 11 +++-
 .../InsertFromQueryGeneratorSpecTest.groovy | 66 
 5 files changed, 99 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1546cc9d/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
index 9f179d1..e5cd540 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/dto/ColumnInfo.java
@@ -45,14 +45,23 @@ public class ColumnInfo {
   }
 
   public ColumnInfo(String name, String type, String comment) {
-this.name = name;
-this.type = type;
-this.comment = comment;
+this(name, type, null, null, comment);
+  }
+
+  public ColumnInfo(String name, String type, Integer precision, String 
comment) {
+this(name, type, precision, null, comment);
+  }
+
+  public ColumnInfo(String name, String type, Integer precision, Integer 
scale) {
+this(name, type, precision, scale, null);
+  }
+
+  public ColumnInfo(String name, String type, Integer precision) {
+this(name, type, precision, null, null);
   }
 
   public ColumnInfo(String name, String type) {
-this.name = name;
-this.type = type;
+this(name, type, null, null, null);
   }
 
   public String getName() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/1546cc9d/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
index eab3a4b..774075d 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/CreateTableQueryGenerator.java
@@ -48,13 +48,16 @@ public class CreateTableQueryGenerator implements 
QueryGenerator{
   public Optional getQuery(){
 StringBuffer query = new StringBuffer();
 query.append("CREATE TABLE ");
-query.append(tableMeta.getDatabase()).append(".");
-query.append(tableMeta.getTable()).append(" ");
+query.append("`").append(tableMeta.getDatabase()).append("`").append(".");
+query.append("`").append(tableMeta.getTable()).append("`").append(" ");
 query.append("(").append(getColumnQuery(tableMeta.getColumns())).append(") 
");
 if(null != tableMeta.getDetailedInfo() && null != 
tableMeta.getDetailedInfo().getParameters()){
   String tableComment = 
tableMeta.getDetailedInfo().getParameters().get(COMMENT);
   if(!Strings.isNullOrEmpty(tableComment)){
-query.append(" COMMENT ").append(tableComment);
+tableComment = 
tableMeta.getDetailedInfo().getParameters().get(COMMENT.toLowerCase());
+if(!Strings.isNullOrEmpty(tableComment)) {
+  query.append(" COMMENT ").append(tableComment);
+}
   }
 }
 if(null != tableMeta.getPartitionInfo() ) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/1546cc9d/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java
--
diff --git