You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2018/02/28 19:23:19 UTC

[1/3] hive git commit: HIVE-18820 : Operation doesn't always clean up log4j for operation log (Sergey Shelukhin, reviewed by Gunther Hagleitner)

Repository: hive
Updated Branches:
  refs/heads/master a0b262875 -> 1837846da


HIVE-18820 : Operation doesn't always clean up log4j for operation log (Sergey Shelukhin, reviewed by Gunther Hagleitner)


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

Branch: refs/heads/master
Commit: 5393e9f7c7df7fdf740aae62c856a2f56c804923
Parents: a0b2628
Author: sergey <se...@apache.org>
Authored: Wed Feb 28 11:12:38 2018 -0800
Committer: sergey <se...@apache.org>
Committed: Wed Feb 28 11:12:38 2018 -0800

----------------------------------------------------------------------
 .../org/apache/hive/service/cli/operation/Operation.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/5393e9f7/service/src/java/org/apache/hive/service/cli/operation/Operation.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/cli/operation/Operation.java b/service/src/java/org/apache/hive/service/cli/operation/Operation.java
index 51e2165..3706c72 100644
--- a/service/src/java/org/apache/hive/service/cli/operation/Operation.java
+++ b/service/src/java/org/apache/hive/service/cli/operation/Operation.java
@@ -247,6 +247,10 @@ public abstract class Operation {
   }
 
   protected synchronized void cleanupOperationLog() {
+    // stop the appenders for the operation log
+    String queryId = queryState.getQueryId();
+    LogUtils.stopQueryAppender(LogDivertAppender.QUERY_ROUTING_APPENDER, queryId);
+    LogUtils.stopQueryAppender(LogDivertAppenderForTest.TEST_QUERY_ROUTING_APPENDER, queryId);
     if (isOperationLogEnabled) {
       if (opHandle == null) {
         LOG.warn("Operation seems to be in invalid state, opHandle is null");
@@ -259,11 +263,8 @@ public abstract class Operation {
       } else {
         operationLog.close();
       }
-      // stop the appenders for the operation log
-      String queryId = queryState.getQueryId();
-      LogUtils.stopQueryAppender(LogDivertAppender.QUERY_ROUTING_APPENDER, queryId);
-      LogUtils.stopQueryAppender(LogDivertAppenderForTest.TEST_QUERY_ROUTING_APPENDER, queryId);
     }
+
   }
 
   public abstract void cancel(OperationState stateAfterCancel) throws HiveSQLException;


[2/3] hive git commit: HIVE-18796 : fix TestSSL (Sergey Shelukhin, reviewed by Zoltan Haindrich)

Posted by se...@apache.org.
HIVE-18796 : fix TestSSL (Sergey Shelukhin, reviewed by Zoltan Haindrich)


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

Branch: refs/heads/master
Commit: 5106df059f40c471b91bc969832001218171cdee
Parents: 5393e9f
Author: sergey <se...@apache.org>
Authored: Wed Feb 28 11:13:43 2018 -0800
Committer: sergey <se...@apache.org>
Committed: Wed Feb 28 11:13:43 2018 -0800

----------------------------------------------------------------------
 common/src/java/org/apache/hadoop/hive/conf/HiveConf.java    | 1 +
 .../src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java     | 2 ++
 .../src/java/org/apache/hive/service/server/HiveServer2.java | 8 ++++++--
 3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/5106df05/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 0880a96..1e322b8 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -574,6 +574,7 @@ public class HiveConf extends Configuration {
         "If not set, defaults to the codec extension for text files (e.g. \".gz\"), or no extension otherwise."),
 
     HIVE_IN_TEST("hive.in.test", false, "internal usage only, true in test mode", true),
+    HIVE_IN_TEST_SSL("hive.in.ssl.test", false, "internal usage only, true in SSL test mode", true),
     HIVE_IN_TEST_IDE("hive.in.ide.test", false, "internal usage only, true if test running in ide",
         true),
     HIVE_TESTING_SHORT_LOGS("hive.testing.short.logs", false,

http://git-wip-us.apache.org/repos/asf/hive/blob/5106df05/itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java b/itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java
index 986ccd6..78a23a2 100644
--- a/itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java
+++ b/itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java
@@ -74,12 +74,14 @@ public class SSLTestUtils {
     confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_TRANSPORT_MODE.varname, HS2_HTTP_MODE);
     confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_HTTP_PATH.varname, HS2_HTTP_ENDPOINT);
     confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_ENABLE_DOAS.varname, "true");
+    confOverlay.put(HiveConf.ConfVars.HIVE_IN_TEST_SSL.varname, "true");
   }
 
   public static void setBinaryConfOverlay(Map<String, String> confOverlay) {
     confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_TRANSPORT_MODE.varname, HS2_BINARY_MODE);
     confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_AUTHENTICATION.varname, HS2_BINARY_AUTH_MODE);
     confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_ENABLE_DOAS.varname, "true");
+    confOverlay.put(HiveConf.ConfVars.HIVE_IN_TEST_SSL.varname, "true");
   }
 
   public static void setupTestTableWithData(String tableName, Path dataFilePath,

http://git-wip-us.apache.org/repos/asf/hive/blob/5106df05/service/src/java/org/apache/hive/service/server/HiveServer2.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/server/HiveServer2.java b/service/src/java/org/apache/hive/service/server/HiveServer2.java
index 6c1a0b9..86c9c2b 100644
--- a/service/src/java/org/apache/hive/service/server/HiveServer2.java
+++ b/service/src/java/org/apache/hive/service/server/HiveServer2.java
@@ -305,8 +305,12 @@ public class HiveServer2 extends CompositeService {
     WMFullResourcePlan resourcePlan;
     try {
       resourcePlan = sessionHive.getActiveResourcePlan();
-    } catch (HiveException e) {
-      throw new RuntimeException(e);
+    } catch (Throwable e) {
+      if (!HiveConf.getBoolVar(hiveConf, ConfVars.HIVE_IN_TEST_SSL)) {
+        throw new RuntimeException(e);
+      } else {
+        resourcePlan = null; // Ignore errors in SSL tests where the connection is misconfigured.
+      }
     }
     if (hasQueue && resourcePlan == null
         && HiveConf.getBoolVar(hiveConf, ConfVars.HIVE_IN_TEST)) {


[3/3] hive git commit: HIVE-17937 : llap_acid_fast test is flaky (Teddy Choi, reviewed by Sergey Shelukhin)

Posted by se...@apache.org.
HIVE-17937 : llap_acid_fast test is flaky (Teddy Choi, reviewed by Sergey Shelukhin)


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

Branch: refs/heads/master
Commit: 1837846dad7dcbfb5cbcab6b01846426e0c2b306
Parents: 5106df0
Author: sergey <se...@apache.org>
Authored: Wed Feb 28 11:16:24 2018 -0800
Committer: sergey <se...@apache.org>
Committed: Wed Feb 28 11:16:24 2018 -0800

----------------------------------------------------------------------
 ql/src/test/queries/clientpositive/llap_acid.q  |   9 +-
 .../queries/clientpositive/llap_acid_fast.q     |   9 +-
 .../results/clientpositive/llap/llap_acid.q.out | 108 ++++++++++---------
 .../clientpositive/llap/llap_acid_fast.q.out    | 108 ++++++++++---------
 .../test/results/clientpositive/llap_acid.q.out |  98 +++++++++--------
 .../results/clientpositive/llap_acid_fast.q.out |  98 +++++++++--------
 6 files changed, 232 insertions(+), 198 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/1837846d/ql/src/test/queries/clientpositive/llap_acid.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_acid.q b/ql/src/test/queries/clientpositive/llap_acid.q
index 8060e33..e0bde30 100644
--- a/ql/src/test/queries/clientpositive/llap_acid.q
+++ b/ql/src/test/queries/clientpositive/llap_acid.q
@@ -23,14 +23,17 @@ partitioned by (csmallint smallint)
 clustered by (cint) into 2 buckets stored as orc;
 
 insert into table orc_llap partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10;
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10;
 insert into table orc_llap partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10;
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10;
 
 alter table orc_llap SET TBLPROPERTIES ('transactional'='true');
 
 insert into table orc_llap partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10;
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10;
 
 SET hive.llap.io.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/1837846d/ql/src/test/queries/clientpositive/llap_acid_fast.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_acid_fast.q b/ql/src/test/queries/clientpositive/llap_acid_fast.q
index aa5ee19..89ca45f 100644
--- a/ql/src/test/queries/clientpositive/llap_acid_fast.q
+++ b/ql/src/test/queries/clientpositive/llap_acid_fast.q
@@ -24,11 +24,14 @@ clustered by (cint) into 2 buckets stored as orc
 TBLPROPERTIES ('transactional'='true', 'transactional_properties'='default');
 
 insert into table orc_llap_acid_fast partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10;
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10;
 insert into table orc_llap_acid_fast partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10;
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10;
 insert into table orc_llap_acid_fast partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10;
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10;
 
 explain vectorization only detail
 select cint, csmallint, cbigint from orc_llap_acid_fast where cint is not null order

http://git-wip-us.apache.org/repos/asf/hive/blob/1837846d/ql/src/test/results/clientpositive/llap/llap_acid.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_acid.q.out b/ql/src/test/results/clientpositive/llap/llap_acid.q.out
index 4ed45e7..e77af75 100644
--- a/ql/src/test/results/clientpositive/llap/llap_acid.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_acid.q.out
@@ -23,12 +23,14 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@orc_llap
 PREHOOK: query: insert into table orc_llap partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap@csmallint=1
 POSTHOOK: query: insert into table orc_llap partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap@csmallint=1
@@ -37,12 +39,14 @@ POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cdouble SIMPLE [(alltypesorc)
 POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ]
 POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 PREHOOK: query: insert into table orc_llap partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap@csmallint=2
 POSTHOOK: query: insert into table orc_llap partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap@csmallint=2
@@ -59,12 +63,14 @@ POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: default@orc_llap
 POSTHOOK: Output: default@orc_llap
 PREHOOK: query: insert into table orc_llap partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap@csmallint=3
 POSTHOOK: query: insert into table orc_llap partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap@csmallint=3
@@ -174,26 +180,26 @@ POSTHOOK: Input: default@orc_llap@csmallint=1
 POSTHOOK: Input: default@orc_llap@csmallint=2
 POSTHOOK: Input: default@orc_llap@csmallint=3
 #### A masked pattern was here ####
--838810013	1	1864027286
--595277064	1	-1645852809
--334595454	1	-1645852809
-185212032	1	-1645852809
-186967185	1	-1645852809
-241008004	1	-1645852809
-246423894	1	-1645852809
-518213127	1	-1645852809
-584923170	1	-1645852809
-708885482	1	-1645852809
--838810013	2	1864027286
--595277064	2	-1645852809
--334595454	2	-1645852809
-185212032	2	-1645852809
-186967185	2	-1645852809
-241008004	2	-1645852809
-246423894	2	-1645852809
-518213127	2	-1645852809
-584923170	2	-1645852809
-708885482	2	-1645852809
+-894716315	1	1864027286
+206154150	1	1864027286
+253665376	1	NULL
+253665376	1	NULL
+253665376	1	NULL
+528534767	1	NULL
+528534767	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+-894716315	2	1864027286
+206154150	2	1864027286
+253665376	2	NULL
+253665376	2	NULL
+253665376	2	NULL
+528534767	2	NULL
+528534767	2	NULL
+626923679	2	NULL
+626923679	2	NULL
+626923679	2	NULL
 -923308739	3	-1887561756
 -3728	3	-1887561756
 762	3	-1645852809
@@ -206,14 +212,16 @@ POSTHOOK: Input: default@orc_llap@csmallint=3
 528534767	3	NULL
 PREHOOK: query: insert into table orc_llap partition (csmallint = 1) values (1, 1, 1, 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_llap@csmallint=1
 POSTHOOK: query: insert into table orc_llap partition (csmallint = 1) values (1, 1, 1, 1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_llap@csmallint=1
-POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cbigint EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
-POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cdouble EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col4, type:string, comment:), ]
-POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cfloat EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col3, type:string, comment:), ]
-POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cint EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
+POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cbigint SCRIPT []
+POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cdouble SCRIPT []
+POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cfloat SCRIPT []
+POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cint SCRIPT []
 PREHOOK: query: explain vectorization only detail
 update orc_llap set cbigint = 2 where cint = 1
 PREHOOK: type: QUERY
@@ -426,27 +434,27 @@ POSTHOOK: Input: default@orc_llap@csmallint=1
 POSTHOOK: Input: default@orc_llap@csmallint=2
 POSTHOOK: Input: default@orc_llap@csmallint=3
 #### A masked pattern was here ####
--838810013	1	1864027286
--595277064	1	-1645852809
--334595454	1	-1645852809
+-894716315	1	1864027286
 1	1	2
-185212032	1	-1645852809
-186967185	1	-1645852809
-241008004	1	-1645852809
-246423894	1	-1645852809
-518213127	1	-1645852809
-584923170	1	-1645852809
-708885482	1	-1645852809
--838810013	2	1864027286
--595277064	2	-1645852809
--334595454	2	-1645852809
-185212032	2	-1645852809
-186967185	2	-1645852809
-241008004	2	-1645852809
-246423894	2	-1645852809
-518213127	2	-1645852809
-584923170	2	-1645852809
-708885482	2	-1645852809
+206154150	1	1864027286
+253665376	1	NULL
+253665376	1	NULL
+253665376	1	NULL
+528534767	1	NULL
+528534767	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+-894716315	2	1864027286
+206154150	2	1864027286
+253665376	2	NULL
+253665376	2	NULL
+253665376	2	NULL
+528534767	2	NULL
+528534767	2	NULL
+626923679	2	NULL
+626923679	2	NULL
+626923679	2	NULL
 -923308739	3	-1887561756
 -3728	3	-1887561756
 762	3	-1645852809

http://git-wip-us.apache.org/repos/asf/hive/blob/1837846d/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out b/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
index 42af8e6..efcc3c0 100644
--- a/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
@@ -25,12 +25,14 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@orc_llap_acid_fast
 PREHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap_acid_fast@csmallint=1
 POSTHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap_acid_fast@csmallint=1
@@ -39,12 +41,14 @@ POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cdouble SIMPLE [(al
 POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ]
 POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 PREHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap_acid_fast@csmallint=2
 POSTHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap_acid_fast@csmallint=2
@@ -53,12 +57,14 @@ POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=2).cdouble SIMPLE [(al
 POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=2).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ]
 POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=2).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 PREHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap_acid_fast@csmallint=3
 POSTHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap_acid_fast@csmallint=3
@@ -168,26 +174,26 @@ POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=1
 POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=2
 POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=3
 #### A masked pattern was here ####
--838810013	1	1864027286
--595277064	1	-1645852809
--334595454	1	-1645852809
-185212032	1	-1645852809
-186967185	1	-1645852809
-241008004	1	-1645852809
-246423894	1	-1645852809
-518213127	1	-1645852809
-584923170	1	-1645852809
-708885482	1	-1645852809
--838810013	2	1864027286
--595277064	2	-1645852809
--334595454	2	-1645852809
-185212032	2	-1645852809
-186967185	2	-1645852809
-241008004	2	-1645852809
-246423894	2	-1645852809
-518213127	2	-1645852809
-584923170	2	-1645852809
-708885482	2	-1645852809
+-894716315	1	1864027286
+206154150	1	1864027286
+253665376	1	NULL
+253665376	1	NULL
+253665376	1	NULL
+528534767	1	NULL
+528534767	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+-894716315	2	1864027286
+206154150	2	1864027286
+253665376	2	NULL
+253665376	2	NULL
+253665376	2	NULL
+528534767	2	NULL
+528534767	2	NULL
+626923679	2	NULL
+626923679	2	NULL
+626923679	2	NULL
 -923308739	3	-1887561756
 -3728	3	-1887561756
 762	3	-1645852809
@@ -200,14 +206,16 @@ POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=3
 528534767	3	NULL
 PREHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 1) values (1, 1, 1, 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_llap_acid_fast@csmallint=1
 POSTHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 1) values (1, 1, 1, 1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_llap_acid_fast@csmallint=1
-POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cbigint EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
-POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cdouble EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col4, type:string, comment:), ]
-POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cfloat EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col3, type:string, comment:), ]
-POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cint EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
+POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cbigint SCRIPT []
+POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cdouble SCRIPT []
+POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cfloat SCRIPT []
+POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cint SCRIPT []
 PREHOOK: query: explain vectorization only detail
 update orc_llap_acid_fast set cbigint = 2 where cint = 1
 PREHOOK: type: QUERY
@@ -420,27 +428,27 @@ POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=1
 POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=2
 POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=3
 #### A masked pattern was here ####
--838810013	1	1864027286
--595277064	1	-1645852809
--334595454	1	-1645852809
+-894716315	1	1864027286
 1	1	2
-185212032	1	-1645852809
-186967185	1	-1645852809
-241008004	1	-1645852809
-246423894	1	-1645852809
-518213127	1	-1645852809
-584923170	1	-1645852809
-708885482	1	-1645852809
--838810013	2	1864027286
--595277064	2	-1645852809
--334595454	2	-1645852809
-185212032	2	-1645852809
-186967185	2	-1645852809
-241008004	2	-1645852809
-246423894	2	-1645852809
-518213127	2	-1645852809
-584923170	2	-1645852809
-708885482	2	-1645852809
+206154150	1	1864027286
+253665376	1	NULL
+253665376	1	NULL
+253665376	1	NULL
+528534767	1	NULL
+528534767	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+-894716315	2	1864027286
+206154150	2	1864027286
+253665376	2	NULL
+253665376	2	NULL
+253665376	2	NULL
+528534767	2	NULL
+528534767	2	NULL
+626923679	2	NULL
+626923679	2	NULL
+626923679	2	NULL
 -923308739	3	-1887561756
 -3728	3	-1887561756
 762	3	-1645852809

http://git-wip-us.apache.org/repos/asf/hive/blob/1837846d/ql/src/test/results/clientpositive/llap_acid.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap_acid.q.out b/ql/src/test/results/clientpositive/llap_acid.q.out
index efd174c..55fabee 100644
--- a/ql/src/test/results/clientpositive/llap_acid.q.out
+++ b/ql/src/test/results/clientpositive/llap_acid.q.out
@@ -23,12 +23,14 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@orc_llap
 PREHOOK: query: insert into table orc_llap partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap@csmallint=1
 POSTHOOK: query: insert into table orc_llap partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap@csmallint=1
@@ -37,12 +39,14 @@ POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cdouble SIMPLE [(alltypesorc)
 POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ]
 POSTHOOK: Lineage: orc_llap PARTITION(csmallint=1).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 PREHOOK: query: insert into table orc_llap partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap@csmallint=2
 POSTHOOK: query: insert into table orc_llap partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap@csmallint=2
@@ -59,12 +63,14 @@ POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: default@orc_llap
 POSTHOOK: Output: default@orc_llap
 PREHOOK: query: insert into table orc_llap partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap@csmallint=3
 POSTHOOK: query: insert into table orc_llap partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap@csmallint=3
@@ -151,26 +157,26 @@ POSTHOOK: Input: default@orc_llap@csmallint=1
 POSTHOOK: Input: default@orc_llap@csmallint=2
 POSTHOOK: Input: default@orc_llap@csmallint=3
 #### A masked pattern was here ####
--970918963	1	-588508542
--734267047	1	895807844
--548534304	1	-1900081338
--546972460	1	665899329
--469581869	1	1033373031
--101217409	1	183045850
--37908611	1	-1378658304
-274816197	1	-437339127
-371876492	1	1862746855
-927956889	1	-935575737
--970918963	2	-588508542
--734267047	2	895807844
--548534304	2	-1900081338
--546972460	2	665899329
--469581869	2	1033373031
--101217409	2	183045850
--37908611	2	-1378658304
-274816197	2	-437339127
-371876492	2	1862746855
-927956889	2	-935575737
+-894716315	1	1864027286
+206154150	1	1864027286
+253665376	1	NULL
+253665376	1	NULL
+253665376	1	NULL
+528534767	1	NULL
+528534767	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+-894716315	2	1864027286
+206154150	2	1864027286
+253665376	2	NULL
+253665376	2	NULL
+253665376	2	NULL
+528534767	2	NULL
+528534767	2	NULL
+626923679	2	NULL
+626923679	2	NULL
+626923679	2	NULL
 -923308739	3	-1887561756
 -3728	3	-1887561756
 762	3	-1645852809
@@ -354,27 +360,27 @@ POSTHOOK: Input: default@orc_llap@csmallint=1
 POSTHOOK: Input: default@orc_llap@csmallint=2
 POSTHOOK: Input: default@orc_llap@csmallint=3
 #### A masked pattern was here ####
--970918963	1	-588508542
--734267047	1	895807844
--548534304	1	-1900081338
--546972460	1	665899329
--469581869	1	1033373031
--101217409	1	183045850
--37908611	1	-1378658304
+-894716315	1	1864027286
 1	1	2
-274816197	1	-437339127
-371876492	1	1862746855
-927956889	1	-935575737
--970918963	2	-588508542
--734267047	2	895807844
--548534304	2	-1900081338
--546972460	2	665899329
--469581869	2	1033373031
--101217409	2	183045850
--37908611	2	-1378658304
-274816197	2	-437339127
-371876492	2	1862746855
-927956889	2	-935575737
+206154150	1	1864027286
+253665376	1	NULL
+253665376	1	NULL
+253665376	1	NULL
+528534767	1	NULL
+528534767	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+-894716315	2	1864027286
+206154150	2	1864027286
+253665376	2	NULL
+253665376	2	NULL
+253665376	2	NULL
+528534767	2	NULL
+528534767	2	NULL
+626923679	2	NULL
+626923679	2	NULL
+626923679	2	NULL
 -923308739	3	-1887561756
 -3728	3	-1887561756
 762	3	-1645852809

http://git-wip-us.apache.org/repos/asf/hive/blob/1837846d/ql/src/test/results/clientpositive/llap_acid_fast.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap_acid_fast.q.out b/ql/src/test/results/clientpositive/llap_acid_fast.q.out
index 697dc8a..9a9ed0b 100644
--- a/ql/src/test/results/clientpositive/llap_acid_fast.q.out
+++ b/ql/src/test/results/clientpositive/llap_acid_fast.q.out
@@ -25,12 +25,14 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@orc_llap_acid_fast
 PREHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap_acid_fast@csmallint=1
 POSTHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 1)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap_acid_fast@csmallint=1
@@ -39,12 +41,14 @@ POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cdouble SIMPLE [(al
 POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ]
 POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=1).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 PREHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap_acid_fast@csmallint=2
 POSTHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 2)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble asc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble asc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap_acid_fast@csmallint=2
@@ -53,12 +57,14 @@ POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=2).cdouble SIMPLE [(al
 POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=2).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ]
 POSTHOOK: Lineage: orc_llap_acid_fast PARTITION(csmallint=2).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
 PREHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@orc_llap_acid_fast@csmallint=3
 POSTHOOK: query: insert into table orc_llap_acid_fast partition (csmallint = 3)
-select cint, cbigint, cfloat, cdouble from alltypesorc order by cdouble desc limit 10
+select cint, cbigint, cfloat, cdouble from alltypesorc
+where cdouble is not null order by cdouble desc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: default@orc_llap_acid_fast@csmallint=3
@@ -145,26 +151,26 @@ POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=1
 POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=2
 POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=3
 #### A masked pattern was here ####
--970918963	1	-588508542
--734267047	1	895807844
--548534304	1	-1900081338
--546972460	1	665899329
--469581869	1	1033373031
--101217409	1	183045850
--37908611	1	-1378658304
-274816197	1	-437339127
-371876492	1	1862746855
-927956889	1	-935575737
--970918963	2	-588508542
--734267047	2	895807844
--548534304	2	-1900081338
--546972460	2	665899329
--469581869	2	1033373031
--101217409	2	183045850
--37908611	2	-1378658304
-274816197	2	-437339127
-371876492	2	1862746855
-927956889	2	-935575737
+-894716315	1	1864027286
+206154150	1	1864027286
+253665376	1	NULL
+253665376	1	NULL
+253665376	1	NULL
+528534767	1	NULL
+528534767	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+-894716315	2	1864027286
+206154150	2	1864027286
+253665376	2	NULL
+253665376	2	NULL
+253665376	2	NULL
+528534767	2	NULL
+528534767	2	NULL
+626923679	2	NULL
+626923679	2	NULL
+626923679	2	NULL
 -923308739	3	-1887561756
 -3728	3	-1887561756
 762	3	-1645852809
@@ -348,27 +354,27 @@ POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=1
 POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=2
 POSTHOOK: Input: default@orc_llap_acid_fast@csmallint=3
 #### A masked pattern was here ####
--970918963	1	-588508542
--734267047	1	895807844
--548534304	1	-1900081338
--546972460	1	665899329
--469581869	1	1033373031
--101217409	1	183045850
--37908611	1	-1378658304
+-894716315	1	1864027286
 1	1	2
-274816197	1	-437339127
-371876492	1	1862746855
-927956889	1	-935575737
--970918963	2	-588508542
--734267047	2	895807844
--548534304	2	-1900081338
--546972460	2	665899329
--469581869	2	1033373031
--101217409	2	183045850
--37908611	2	-1378658304
-274816197	2	-437339127
-371876492	2	1862746855
-927956889	2	-935575737
+206154150	1	1864027286
+253665376	1	NULL
+253665376	1	NULL
+253665376	1	NULL
+528534767	1	NULL
+528534767	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+626923679	1	NULL
+-894716315	2	1864027286
+206154150	2	1864027286
+253665376	2	NULL
+253665376	2	NULL
+253665376	2	NULL
+528534767	2	NULL
+528534767	2	NULL
+626923679	2	NULL
+626923679	2	NULL
+626923679	2	NULL
 -923308739	3	-1887561756
 -3728	3	-1887561756
 762	3	-1645852809