[hive] branch master updated: HIVE-21641: Llap external client returns decimal columns in different precision/scale as compared to beeline (Shubham Chaurasia, via Gopal V)

[gopalv]

This is an automated email from the ASF dual-hosted git repository.

gopalv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new ff98efa  HIVE-21641: Llap external client returns decimal columns in 
different precision/scale as compared to beeline (Shubham Chaurasia, via Gopal 
V)
ff98efa is described below

commit ff98efa7c6f2b241d8fddd0ac8dc55e817ecb234
Author: Shubham Chaurasia <schaura...@cloudera.com>
AuthorDate: Mon May 6 22:06:19 2019 -0700

    HIVE-21641: Llap external client returns decimal columns in different 
precision/scale as compared to beeline (Shubham Chaurasia, via Gopal V)
    
    Signed-off-by: Gopal V <gop...@apache.org>
---
 .../hive/jdbc/TestJdbcGenericUDTFGetSplits.java    | 49 +++++++++++++++++++---
 .../apache/hadoop/hive/ql/parse/ParseUtils.java    |  2 +-
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcGenericUDTFGetSplits.java
 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcGenericUDTFGetSplits.java
index b94868b..f6f64b8 100644
--- 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcGenericUDTFGetSplits.java
+++ 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcGenericUDTFGetSplits.java
@@ -34,18 +34,17 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
+import org.apache.hadoop.hive.llap.FieldDesc;
 import org.apache.hadoop.hive.llap.LlapBaseInputFormat;
-import org.apache.hadoop.hive.metastore.api.WMTrigger;
-import org.apache.hadoop.hive.ql.wm.Action;
-import org.apache.hadoop.hive.ql.wm.ExecutionTrigger;
-import org.apache.hadoop.hive.ql.wm.Expression;
-import org.apache.hadoop.hive.ql.wm.ExpressionFactory;
-import org.apache.hadoop.hive.ql.wm.Trigger;
+import org.apache.hadoop.hive.llap.LlapInputSplit;
+import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo;
+import org.apache.hadoop.mapred.JobConf;
 import org.apache.hive.jdbc.miniHS2.MiniHS2;
 import org.apache.hive.jdbc.miniHS2.MiniHS2.MiniClusterType;
 import org.junit.After;
@@ -138,6 +137,44 @@ public class TestJdbcGenericUDTFGetSplits {
     runQuery(query, setCmds, 10);
   }
 
+  @Test
+  public void testDecimalPrecisionAndScale() throws Exception {
+    try (Statement stmt = hs2Conn.createStatement()) {
+      stmt.execute("CREATE TABLE decimal_test_table(decimal_col 
DECIMAL(6,2))");
+      stmt.execute("INSERT INTO decimal_test_table VALUES(2507.92)");
+
+      ResultSet rs = stmt.executeQuery("SELECT * FROM decimal_test_table");
+      assertTrue(rs.next());
+      rs.close();
+
+      String url = miniHS2.getJdbcURL();
+      String user = System.getProperty("user.name");
+      String pwd = user;
+      String handleId = UUID.randomUUID().toString();
+      String sql = "SELECT avg(decimal_col)/3 FROM decimal_test_table";
+
+      // make request through llap-ext-client
+      JobConf job = new JobConf(conf);
+      job.set(LlapBaseInputFormat.URL_KEY, url);
+      job.set(LlapBaseInputFormat.USER_KEY, user);
+      job.set(LlapBaseInputFormat.PWD_KEY, pwd);
+      job.set(LlapBaseInputFormat.QUERY_KEY, sql);
+      job.set(LlapBaseInputFormat.HANDLE_ID, handleId);
+
+      LlapBaseInputFormat llapBaseInputFormat = new LlapBaseInputFormat();
+      //schema split
+      LlapInputSplit schemaSplit = (LlapInputSplit) 
llapBaseInputFormat.getSplits(job, 0)[0];
+      assertNotNull(schemaSplit);
+      FieldDesc fieldDesc = schemaSplit.getSchema().getColumns().get(0);
+      DecimalTypeInfo type = (DecimalTypeInfo) fieldDesc.getTypeInfo();
+      assertEquals(38, type.getPrecision());
+      assertEquals(24, type.scale());
+
+      LlapBaseInputFormat.close(handleId);
+    }
+  }
+
+
   private void runQuery(final String query, final List<String> setCmds,
     final int numRows) throws Exception {
 
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java 
b/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java
index 07c65af..537af20 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java
@@ -558,7 +558,7 @@ public final class ParseUtils {
     ctx.setIsLoadingMaterializedView(true);
     final ASTNode ast = parse(viewQuery, ctx);
     final CalcitePlanner analyzer = getAnalyzer(conf, ctx);
-    analyzer.genLogicalPlan(ast);
+    analyzer.analyze(ast, ctx);
     return analyzer.getResultSchema();
   }