Repository: ambari Updated Branches: refs/heads/trunk 910da3d5d -> 2a4bc9d2e
AMBARI-20223. Hive view 2.0 Fetch stats doesn't work when you point against LLAP. (gauravn7) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a4bc9d2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a4bc9d2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a4bc9d2 Branch: refs/heads/trunk Commit: 2a4bc9d2e1053c91be732c913bc3020be9a871e7 Parents: 910da3d Author: Gaurav Nagar <grv...@gmail.com> Authored: Tue Feb 28 18:54:59 2017 +0530 Committer: Gaurav Nagar <grv...@gmail.com> Committed: Tue Feb 28 18:56:22 2017 +0530 ---------------------------------------------------------------------- .../internal/query/generators/AlterTableQueryGenerator.java | 2 +- .../internal/query/generators/AnalyzeTableQueryGenerator.java | 2 +- .../query/generators/FetchColumnStatsQueryGenerator.java | 2 +- .../internal/query/generators/InsertFromQueryGenerator.java | 2 +- .../internal/query/generators/RenameTableQueryGenerator.java | 4 ++-- .../internal/query/generators/AlterTableQueryGeneratorTest.java | 4 ++-- .../query/generators/RenameTableQueryGeneratorSpecTest.groovy | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2a4bc9d2/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGenerator.java ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGenerator.java b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGenerator.java index b119f6a..eece538 100644 --- a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGenerator.java +++ b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGenerator.java @@ -58,7 +58,7 @@ public class AlterTableQueryGenerator implements QueryGenerator { public String getQueryPerfix() { return new StringBuffer(" ALTER TABLE ") - .append("`").append(this.getOldMeta().getDatabase()).append(".").append(this.getOldMeta().getTable().trim()).append("` ").toString(); + .append("`").append(this.getOldMeta().getDatabase()).append("`.`").append(this.getOldMeta().getTable().trim()).append("` ").toString(); } public Optional<String> getQuery() { http://git-wip-us.apache.org/repos/asf/ambari/blob/2a4bc9d2/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AnalyzeTableQueryGenerator.java ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AnalyzeTableQueryGenerator.java b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AnalyzeTableQueryGenerator.java index 902d959..1d68407 100644 --- a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AnalyzeTableQueryGenerator.java +++ b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/AnalyzeTableQueryGenerator.java @@ -34,7 +34,7 @@ public class AnalyzeTableQueryGenerator implements QueryGenerator { @Override public Optional<String> getQuery() throws ServiceException { - return Optional.of("ANALYZE TABLE " + "`" + databaseName + "." + tableName + "`" + " COMPUTE STATISTICS " + + return Optional.of("ANALYZE TABLE " + "`" + databaseName + "`.`" + tableName + "`" + " COMPUTE STATISTICS " + (shouldAnalyzeColumns? " FOR COLUMNS ": "") + ";"); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/2a4bc9d2/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/FetchColumnStatsQueryGenerator.java ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/FetchColumnStatsQueryGenerator.java b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/FetchColumnStatsQueryGenerator.java index 73b3698..9c815cf 100644 --- a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/FetchColumnStatsQueryGenerator.java +++ b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/FetchColumnStatsQueryGenerator.java @@ -34,7 +34,7 @@ public class FetchColumnStatsQueryGenerator implements QueryGenerator{ @Override public Optional<String> getQuery() throws ServiceException { - return Optional.of("DESCRIBE FORMATTED " + "`" + this.databaseName + "." + this.tableName + "." + this.columnName + + return Optional.of("DESCRIBE FORMATTED " + "`" + this.databaseName + "`.`" + this.tableName + "` `" + this.columnName + "`" ); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/2a4bc9d2/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 b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java index 42cec0a..b544100 100644 --- a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java +++ b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java @@ -38,7 +38,7 @@ public class InsertFromQueryGenerator implements QueryGenerator{ @Override public Optional<String> getQuery() throws ServiceException { - StringBuilder insertQuery = new StringBuilder("INSERT INTO TABLE `").append(insertFromQueryInput.getToDatabase()).append(".") + StringBuilder insertQuery = new StringBuilder("INSERT INTO TABLE `").append(insertFromQueryInput.getToDatabase()).append("`.`") .append(insertFromQueryInput.getToTable()).append("`") .append(" SELECT "); http://git-wip-us.apache.org/repos/asf/ambari/blob/2a4bc9d2/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGenerator.java ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGenerator.java b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGenerator.java index 3406b80..3853807 100644 --- a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGenerator.java +++ b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGenerator.java @@ -60,7 +60,7 @@ public class RenameTableQueryGenerator implements QueryGenerator { public Optional<String> getQuery() throws ServiceException { StringBuilder queryBuilder = new StringBuilder("ALTER TABLE `"); if(!Strings.isNullOrEmpty(this.getOldDatabaseName())){ - queryBuilder.append(this.getOldDatabaseName().trim()).append("."); + queryBuilder.append(this.getOldDatabaseName().trim()).append("`.`"); } if(!Strings.isNullOrEmpty(this.getOldTableName())){ queryBuilder.append(this.getOldTableName().trim()); @@ -70,7 +70,7 @@ public class RenameTableQueryGenerator implements QueryGenerator { queryBuilder.append("` RENAME TO `"); if(!Strings.isNullOrEmpty(this.getNewDatabaseName())){ - queryBuilder.append(this.getNewDatabaseName().trim()).append("."); + queryBuilder.append(this.getNewDatabaseName().trim()).append("`.`"); } if(!Strings.isNullOrEmpty(this.getNewTableName())){ http://git-wip-us.apache.org/repos/asf/ambari/blob/2a4bc9d2/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGeneratorTest.java ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGeneratorTest.java b/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGeneratorTest.java index 35ea416..deb7fb5 100644 --- a/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGeneratorTest.java +++ b/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/AlterTableQueryGeneratorTest.java @@ -228,8 +228,8 @@ public class AlterTableQueryGeneratorTest { LOG.info("hqlQuery : {}", hqlQuery); - String expectedQuery = " ALTER TABLE `default.table2` CHANGE COLUMN `col2` `col3` STRING(333);\n" + - " ALTER TABLE `default.table2` CHANGE COLUMN `col3` `col4` TINYINT"; + String expectedQuery = " ALTER TABLE `default`.`table2` CHANGE COLUMN `col2` `col3` STRING(333);\n" + + " ALTER TABLE `default`.`table2` CHANGE COLUMN `col3` `col4` TINYINT"; Assert.assertEquals("Alter Edit table query did not match ", expectedQuery, hqlQuery); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2a4bc9d2/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGeneratorSpecTest.groovy ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGeneratorSpecTest.groovy b/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGeneratorSpecTest.groovy index cce9e6c..4e1c204 100644 --- a/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGeneratorSpecTest.groovy +++ b/contrib/views/hive20/src/test/java/org/apache/ambari/view/hive20/internal/query/generators/RenameTableQueryGeneratorSpecTest.groovy @@ -38,7 +38,7 @@ public class RenameTableQueryGeneratorSpecTest extends Specification{ then: with(hiveQuery){ - hiveQuery == "ALTER TABLE `d1.tab1` RENAME TO `d2.tab2`" + hiveQuery == "ALTER TABLE `d1`.`tab1` RENAME TO `d2`.`tab2`" } } @@ -57,7 +57,7 @@ public class RenameTableQueryGeneratorSpecTest extends Specification{ then: with(hiveQuery){ - hiveQuery == "ALTER TABLE `tab1` RENAME TO `d2.tab2`" + hiveQuery == "ALTER TABLE `tab1` RENAME TO `d2`.`tab2`" } }