You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2018/05/29 03:24:37 UTC

[2/3] hive git commit: HIVE-18394: Materialized view: "Create Materialized View" should default to rewritable ones (Jesus Camacho Rodriguez, reviewed by Gopal V)

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
index 1f36b34..7720db3 100644
--- a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
@@ -48,7 +48,7 @@ POSTHOOK: Lineage: cmv_basetable_n2.c SCRIPT []
 POSTHOOK: Lineage: cmv_basetable_n2.d SCRIPT []
 POSTHOOK: Lineage: cmv_basetable_n2.t SIMPLE []
 POSTHOOK: Lineage: cmv_basetable_n2.userid SCRIPT []
-PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n2 ENABLE REWRITE
+PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n2
 STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
 TBLPROPERTIES ("druid.segment.granularity" = "HOUR")
 AS
@@ -59,7 +59,7 @@ PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n2
-POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n2 ENABLE REWRITE
+POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n2
 STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
 TBLPROPERTIES ("druid.segment.granularity" = "HOUR")
 AS
@@ -94,7 +94,7 @@ rawDataSize	0
 storage_handler	org.apache.hadoop.hive.druid.DruidStorageHandler
 totalSize	0
 #### A masked pattern was here ####
-PREHOOK: query: CREATE MATERIALIZED VIEW IF NOT EXISTS cmv_mat_view2_n0 ENABLE REWRITE
+PREHOOK: query: CREATE MATERIALIZED VIEW IF NOT EXISTS cmv_mat_view2_n0
 STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
 TBLPROPERTIES ("druid.segment.granularity" = "HOUR")
 AS
@@ -105,7 +105,7 @@ PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view2_n0
-POSTHOOK: query: CREATE MATERIALIZED VIEW IF NOT EXISTS cmv_mat_view2_n0 ENABLE REWRITE
+POSTHOOK: query: CREATE MATERIALIZED VIEW IF NOT EXISTS cmv_mat_view2_n0
 STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
 TBLPROPERTIES ("druid.segment.granularity" = "HOUR")
 AS

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
index 69751a9..5837963 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
@@ -17,12 +17,12 @@ POSTHOOK: Output: default@cmv_basetable_n4
 POSTHOOK: Lineage: cmv_basetable_n4.a SCRIPT []
 POSTHOOK: Lineage: cmv_basetable_n4.b SCRIPT []
 POSTHOOK: Lineage: cmv_basetable_n4.c SCRIPT []
-PREHOOK: query: create materialized view cmv_mat_view_n4 as select a, b, c from cmv_basetable_n4
+PREHOOK: query: create materialized view cmv_mat_view_n4 disable rewrite as select a, b, c from cmv_basetable_n4
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n4
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n4
-POSTHOOK: query: create materialized view cmv_mat_view_n4 as select a, b, c from cmv_basetable_n4
+POSTHOOK: query: create materialized view cmv_mat_view_n4 disable rewrite as select a, b, c from cmv_basetable_n4
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n4
 POSTHOOK: Output: database:default
@@ -79,12 +79,12 @@ POSTHOOK: Input: default@cmv_mat_view_n4
 2	bonnie	172342.20
 3	calvin	978.76
 3	charlie	9.80
-PREHOOK: query: create materialized view if not exists cmv_mat_view2_n1 as select a, c from cmv_basetable_n4
+PREHOOK: query: create materialized view if not exists cmv_mat_view2_n1 disable rewrite as select a, c from cmv_basetable_n4
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n4
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view2_n1
-POSTHOOK: query: create materialized view if not exists cmv_mat_view2_n1 as select a, c from cmv_basetable_n4
+POSTHOOK: query: create materialized view if not exists cmv_mat_view2_n1 disable rewrite as select a, c from cmv_basetable_n4
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n4
 POSTHOOK: Output: database:default
@@ -140,12 +140,12 @@ POSTHOOK: Input: default@cmv_mat_view2_n1
 2	172342.20
 3	978.76
 3	9.80
-PREHOOK: query: create materialized view if not exists cmv_mat_view3 as select * from cmv_basetable_n4 where a > 1
+PREHOOK: query: create materialized view if not exists cmv_mat_view3 disable rewrite as select * from cmv_basetable_n4 where a > 1
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n4
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view3
-POSTHOOK: query: create materialized view if not exists cmv_mat_view3 as select * from cmv_basetable_n4 where a > 1
+POSTHOOK: query: create materialized view if not exists cmv_mat_view3 disable rewrite as select * from cmv_basetable_n4 where a > 1
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n4
 POSTHOOK: Output: database:default
@@ -162,12 +162,12 @@ POSTHOOK: Input: default@cmv_mat_view3
 2	bonnie	172342.20
 3	calvin	978.76
 3	charlie	9.80
-PREHOOK: query: create materialized view cmv_mat_view4 comment 'this is a comment' as select a, sum(c) from cmv_basetable_n4 group by a
+PREHOOK: query: create materialized view cmv_mat_view4 disable rewrite comment 'this is a comment' as select a, sum(c) from cmv_basetable_n4 group by a
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n4
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view4
-POSTHOOK: query: create materialized view cmv_mat_view4 comment 'this is a comment' as select a, sum(c) from cmv_basetable_n4 group by a
+POSTHOOK: query: create materialized view cmv_mat_view4 disable rewrite comment 'this is a comment' as select a, sum(c) from cmv_basetable_n4 group by a
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n4
 POSTHOOK: Output: database:default
@@ -212,13 +212,13 @@ POSTHOOK: Output: default@cmv_basetable2
 POSTHOOK: Lineage: cmv_basetable2.d SCRIPT []
 POSTHOOK: Lineage: cmv_basetable2.e SCRIPT []
 POSTHOOK: Lineage: cmv_basetable2.f SCRIPT []
-PREHOOK: query: create materialized view cmv_mat_view5 tblproperties ('key'='value') as select a, b, d, c, f from cmv_basetable_n4 t1 join cmv_basetable2 t2 on (t1.b = t2.e)
+PREHOOK: query: create materialized view cmv_mat_view5 disable rewrite tblproperties ('key'='value') as select a, b, d, c, f from cmv_basetable_n4 t1 join cmv_basetable2 t2 on (t1.b = t2.e)
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable2
 PREHOOK: Input: default@cmv_basetable_n4
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view5
-POSTHOOK: query: create materialized view cmv_mat_view5 tblproperties ('key'='value') as select a, b, d, c, f from cmv_basetable_n4 t1 join cmv_basetable2 t2 on (t1.b = t2.e)
+POSTHOOK: query: create materialized view cmv_mat_view5 disable rewrite tblproperties ('key'='value') as select a, b, d, c, f from cmv_basetable_n4 t1 join cmv_basetable2 t2 on (t1.b = t2.e)
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable2
 POSTHOOK: Input: default@cmv_basetable_n4

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
index 70649bd..b949618 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
@@ -38,13 +38,13 @@ POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@cmv_basetable_n10
 POSTHOOK: Output: default@cmv_basetable_n10
 #### A masked pattern was here ####
-PREHOOK: query: create materialized view cmv_mat_view_n10 enable rewrite
+PREHOOK: query: create materialized view cmv_mat_view_n10
 as select a, b, c from cmv_basetable_n10 where a = 2
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n10
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n10
-POSTHOOK: query: create materialized view cmv_mat_view_n10 enable rewrite
+POSTHOOK: query: create materialized view cmv_mat_view_n10
 as select a, b, c from cmv_basetable_n10 where a = 2
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n10
@@ -71,13 +71,13 @@ numRows	2
 rawDataSize	408
 totalSize	457
 #### A masked pattern was here ####
-PREHOOK: query: create materialized view if not exists cmv_mat_view2_n4 enable rewrite
+PREHOOK: query: create materialized view if not exists cmv_mat_view2_n4
 as select a, c from cmv_basetable_n10 where a = 3
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n10
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view2_n4
-POSTHOOK: query: create materialized view if not exists cmv_mat_view2_n4 enable rewrite
+POSTHOOK: query: create materialized view if not exists cmv_mat_view2_n4
 as select a, c from cmv_basetable_n10 where a = 3
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n10

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
index 567a9ce..d311f36 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
@@ -38,13 +38,13 @@ POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@cmv_basetable_n9
 POSTHOOK: Output: default@cmv_basetable_n9
 #### A masked pattern was here ####
-PREHOOK: query: create materialized view cmv_mat_view_n9 enable rewrite
+PREHOOK: query: create materialized view cmv_mat_view_n9
 as select b from cmv_basetable_n9 where c > 10.0 group by a, b, c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n9
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n9
-POSTHOOK: query: create materialized view cmv_mat_view_n9 enable rewrite
+POSTHOOK: query: create materialized view cmv_mat_view_n9
 as select b from cmv_basetable_n9 where c > 10.0 group by a, b, c
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n9
@@ -128,13 +128,13 @@ POSTHOOK: Input: default@cmv_basetable_n9
 #### A masked pattern was here ####
 calvin
 bonnie
-PREHOOK: query: create materialized view cmv_mat_view_2 enable rewrite
+PREHOOK: query: create materialized view cmv_mat_view_2
 as select b, c from cmv_basetable_n9 where c > 10.0 group by a, b, c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n9
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_2
-POSTHOOK: query: create materialized view cmv_mat_view_2 enable rewrite
+POSTHOOK: query: create materialized view cmv_mat_view_2
 as select b, c from cmv_basetable_n9 where c > 10.0 group by a, b, c
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n9
@@ -218,13 +218,13 @@ POSTHOOK: Input: default@cmv_basetable_n9
 #### A masked pattern was here ####
 calvin
 bonnie
-PREHOOK: query: create materialized view cmv_mat_view_3 enable rewrite
+PREHOOK: query: create materialized view cmv_mat_view_3
 as select a, b, c from cmv_basetable_n9 where c > 10.0 group by a, b, c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n9
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_3
-POSTHOOK: query: create materialized view cmv_mat_view_3 enable rewrite
+POSTHOOK: query: create materialized view cmv_mat_view_3
 as select a, b, c from cmv_basetable_n9 where c > 10.0 group by a, b, c
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n9
@@ -310,13 +310,13 @@ POSTHOOK: Input: default@cmv_mat_view_3
 #### A masked pattern was here ####
 calvin
 bonnie
-PREHOOK: query: create materialized view cmv_mat_view_4 enable rewrite
+PREHOOK: query: create materialized view cmv_mat_view_4
 as select a, b from cmv_basetable_n9 group by a, b
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n9
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_4
-POSTHOOK: query: create materialized view cmv_mat_view_4 enable rewrite
+POSTHOOK: query: create materialized view cmv_mat_view_4
 as select a, b from cmv_basetable_n9 group by a, b
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n9
@@ -432,7 +432,7 @@ POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@cmv_basetable_2_n4
 POSTHOOK: Output: default@cmv_basetable_2_n4
 #### A masked pattern was here ####
-PREHOOK: query: create materialized view cmv_mat_view_5 enable rewrite
+PREHOOK: query: create materialized view cmv_mat_view_5
 as select cmv_basetable_n9.a, cmv_basetable_2_n4.c
    from cmv_basetable_n9 join cmv_basetable_2_n4 on (cmv_basetable_n9.a = cmv_basetable_2_n4.a)
    where cmv_basetable_2_n4.c > 10.0
@@ -442,7 +442,7 @@ PREHOOK: Input: default@cmv_basetable_2_n4
 PREHOOK: Input: default@cmv_basetable_n9
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_5
-POSTHOOK: query: create materialized view cmv_mat_view_5 enable rewrite
+POSTHOOK: query: create materialized view cmv_mat_view_5
 as select cmv_basetable_n9.a, cmv_basetable_2_n4.c
    from cmv_basetable_n9 join cmv_basetable_2_n4 on (cmv_basetable_n9.a = cmv_basetable_2_n4.a)
    where cmv_basetable_2_n4.c > 10.0

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
index 0d5da8e..d7a8a64 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
@@ -73,14 +73,14 @@ POSTHOOK: Input: default@cmv_basetable_2
 POSTHOOK: Output: default@cmv_basetable_2
 #### A masked pattern was here ####
 PREHOOK: query: EXPLAIN
-CREATE MATERIALIZED VIEW cmv_mat_view ENABLE REWRITE AS
+CREATE MATERIALIZED VIEW cmv_mat_view AS
   SELECT cmv_basetable.a, cmv_basetable_2.c
   FROM cmv_basetable JOIN cmv_basetable_2 ON (cmv_basetable.a = cmv_basetable_2.a)
   WHERE cmv_basetable_2.c > 10.0
   GROUP BY cmv_basetable.a, cmv_basetable_2.c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: query: EXPLAIN
-CREATE MATERIALIZED VIEW cmv_mat_view ENABLE REWRITE AS
+CREATE MATERIALIZED VIEW cmv_mat_view AS
   SELECT cmv_basetable.a, cmv_basetable_2.c
   FROM cmv_basetable JOIN cmv_basetable_2 ON (cmv_basetable.a = cmv_basetable_2.a)
   WHERE cmv_basetable_2.c > 10.0
@@ -211,7 +211,7 @@ STAGE PLANS:
           hdfs directory: true
 #### A masked pattern was here ####
 
-PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view ENABLE REWRITE AS
+PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view AS
   SELECT cmv_basetable.a, cmv_basetable_2.c
   FROM cmv_basetable JOIN cmv_basetable_2 ON (cmv_basetable.a = cmv_basetable_2.a)
   WHERE cmv_basetable_2.c > 10.0
@@ -221,7 +221,7 @@ PREHOOK: Input: default@cmv_basetable
 PREHOOK: Input: default@cmv_basetable_2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view
-POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view ENABLE REWRITE AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view AS
   SELECT cmv_basetable.a, cmv_basetable_2.c
   FROM cmv_basetable JOIN cmv_basetable_2 ON (cmv_basetable.a = cmv_basetable_2.a)
   WHERE cmv_basetable_2.c > 10.0

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
index f01591e..2f34aae 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
@@ -73,14 +73,14 @@ POSTHOOK: Input: default@cmv_basetable_2_n2
 POSTHOOK: Output: default@cmv_basetable_2_n2
 #### A masked pattern was here ####
 PREHOOK: query: EXPLAIN
-CREATE MATERIALIZED VIEW cmv_mat_view_n5 TBLPROPERTIES ('transactional'='true') AS
+CREATE MATERIALIZED VIEW cmv_mat_view_n5 DISABLE REWRITE TBLPROPERTIES ('transactional'='true') AS
   SELECT cmv_basetable_n5.a, cmv_basetable_2_n2.c, sum(cmv_basetable_2_n2.d)
   FROM cmv_basetable_n5 JOIN cmv_basetable_2_n2 ON (cmv_basetable_n5.a = cmv_basetable_2_n2.a)
   WHERE cmv_basetable_2_n2.c > 10.0
   GROUP BY cmv_basetable_n5.a, cmv_basetable_2_n2.c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: query: EXPLAIN
-CREATE MATERIALIZED VIEW cmv_mat_view_n5 TBLPROPERTIES ('transactional'='true') AS
+CREATE MATERIALIZED VIEW cmv_mat_view_n5 DISABLE REWRITE TBLPROPERTIES ('transactional'='true') AS
   SELECT cmv_basetable_n5.a, cmv_basetable_2_n2.c, sum(cmv_basetable_2_n2.d)
   FROM cmv_basetable_n5 JOIN cmv_basetable_2_n2 ON (cmv_basetable_n5.a = cmv_basetable_2_n2.a)
   WHERE cmv_basetable_2_n2.c > 10.0
@@ -215,7 +215,7 @@ STAGE PLANS:
           hdfs directory: true
 #### A masked pattern was here ####
 
-PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n5 TBLPROPERTIES ('transactional'='true') AS
+PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n5 DISABLE REWRITE TBLPROPERTIES ('transactional'='true') AS
   SELECT cmv_basetable_n5.a, cmv_basetable_2_n2.c, sum(cmv_basetable_2_n2.d)
   FROM cmv_basetable_n5 JOIN cmv_basetable_2_n2 ON (cmv_basetable_n5.a = cmv_basetable_2_n2.a)
   WHERE cmv_basetable_2_n2.c > 10.0
@@ -225,7 +225,7 @@ PREHOOK: Input: default@cmv_basetable_2_n2
 PREHOOK: Input: default@cmv_basetable_n5
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n5
-POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n5 TBLPROPERTIES ('transactional'='true') AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n5 DISABLE REWRITE TBLPROPERTIES ('transactional'='true') AS
   SELECT cmv_basetable_n5.a, cmv_basetable_2_n2.c, sum(cmv_basetable_2_n2.d)
   FROM cmv_basetable_n5 JOIN cmv_basetable_2_n2 ON (cmv_basetable_n5.a = cmv_basetable_2_n2.a)
   WHERE cmv_basetable_2_n2.c > 10.0

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
index 26791e4..10039cc 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
@@ -72,7 +72,7 @@ POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@cmv_basetable_2_n3
 POSTHOOK: Output: default@cmv_basetable_2_n3
 #### A masked pattern was here ####
-PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n6 ENABLE REWRITE
+PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n6
   TBLPROPERTIES ('transactional'='true') AS
   SELECT cmv_basetable_n6.a, cmv_basetable_2_n3.c
   FROM cmv_basetable_n6 JOIN cmv_basetable_2_n3 ON (cmv_basetable_n6.a = cmv_basetable_2_n3.a)
@@ -82,7 +82,7 @@ PREHOOK: Input: default@cmv_basetable_2_n3
 PREHOOK: Input: default@cmv_basetable_n6
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n6
-POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n6 ENABLE REWRITE
+POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n6
   TBLPROPERTIES ('transactional'='true') AS
   SELECT cmv_basetable_n6.a, cmv_basetable_2_n3.c
   FROM cmv_basetable_n6 JOIN cmv_basetable_2_n3 ON (cmv_basetable_n6.a = cmv_basetable_2_n3.a)

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
index e570efe..cff7f70 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
@@ -38,13 +38,13 @@ POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@cmv_basetable_n0
 POSTHOOK: Output: default@cmv_basetable_n0
 #### A masked pattern was here ####
-PREHOOK: query: create materialized view cmv_mat_view_n0 enable rewrite
+PREHOOK: query: create materialized view cmv_mat_view_n0
 as select a, b, c from cmv_basetable_n0 where a = 2
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n0
-POSTHOOK: query: create materialized view cmv_mat_view_n0 enable rewrite
+POSTHOOK: query: create materialized view cmv_mat_view_n0
 as select a, b, c from cmv_basetable_n0 where a = 2
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n0
@@ -71,13 +71,13 @@ numRows	2
 rawDataSize	408
 totalSize	457
 #### A masked pattern was here ####
-PREHOOK: query: create materialized view if not exists cmv_mat_view2 enable rewrite
+PREHOOK: query: create materialized view if not exists cmv_mat_view2
 as select a, c from cmv_basetable_n0 where a = 3
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view2
-POSTHOOK: query: create materialized view if not exists cmv_mat_view2 enable rewrite
+POSTHOOK: query: create materialized view if not exists cmv_mat_view2
 as select a, c from cmv_basetable_n0 where a = 3
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_basetable_n0

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
index 284d0a9..e5fb23d 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
@@ -62,13 +62,13 @@ PREHOOK: Input: database:db2
 POSTHOOK: query: use db2
 POSTHOOK: type: SWITCHDATABASE
 POSTHOOK: Input: database:db2
-PREHOOK: query: create materialized view cmv_mat_view_n7 enable rewrite
+PREHOOK: query: create materialized view cmv_mat_view_n7
 as select a, b, c from db1.cmv_basetable_n7 where a = 2
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: db1@cmv_basetable_n7
 PREHOOK: Output: database:db2
 PREHOOK: Output: db2@cmv_mat_view_n7
-POSTHOOK: query: create materialized view cmv_mat_view_n7 enable rewrite
+POSTHOOK: query: create materialized view cmv_mat_view_n7
 as select a, b, c from db1.cmv_basetable_n7 where a = 2
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: db1@cmv_basetable_n7
@@ -95,13 +95,13 @@ numRows	2
 rawDataSize	408
 totalSize	457
 #### A masked pattern was here ####
-PREHOOK: query: create materialized view if not exists cmv_mat_view2_n2 enable rewrite
+PREHOOK: query: create materialized view if not exists cmv_mat_view2_n2
 as select a, c from db1.cmv_basetable_n7 where a = 3
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: db1@cmv_basetable_n7
 PREHOOK: Output: database:db2
 PREHOOK: Output: db2@cmv_mat_view2_n2
-POSTHOOK: query: create materialized view if not exists cmv_mat_view2_n2 enable rewrite
+POSTHOOK: query: create materialized view if not exists cmv_mat_view2_n2
 as select a, c from db1.cmv_basetable_n7 where a = 3
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: db1@cmv_basetable_n7

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
index 0a310a3..c85be4a 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
@@ -73,14 +73,14 @@ POSTHOOK: Input: default@cmv_basetable_2_n0
 POSTHOOK: Output: default@cmv_basetable_2_n0
 #### A masked pattern was here ####
 PREHOOK: query: EXPLAIN
-CREATE MATERIALIZED VIEW cmv_mat_view_n1 ENABLE REWRITE AS
+CREATE MATERIALIZED VIEW cmv_mat_view_n1 AS
   SELECT cmv_basetable_n1.a, cmv_basetable_2_n0.c
   FROM cmv_basetable_n1 JOIN cmv_basetable_2_n0 ON (cmv_basetable_n1.a = cmv_basetable_2_n0.a)
   WHERE cmv_basetable_2_n0.c > 10.0
   GROUP BY cmv_basetable_n1.a, cmv_basetable_2_n0.c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: query: EXPLAIN
-CREATE MATERIALIZED VIEW cmv_mat_view_n1 ENABLE REWRITE AS
+CREATE MATERIALIZED VIEW cmv_mat_view_n1 AS
   SELECT cmv_basetable_n1.a, cmv_basetable_2_n0.c
   FROM cmv_basetable_n1 JOIN cmv_basetable_2_n0 ON (cmv_basetable_n1.a = cmv_basetable_2_n0.a)
   WHERE cmv_basetable_2_n0.c > 10.0
@@ -211,7 +211,7 @@ STAGE PLANS:
           hdfs directory: true
 #### A masked pattern was here ####
 
-PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n1 ENABLE REWRITE AS
+PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n1 AS
   SELECT cmv_basetable_n1.a, cmv_basetable_2_n0.c
   FROM cmv_basetable_n1 JOIN cmv_basetable_2_n0 ON (cmv_basetable_n1.a = cmv_basetable_2_n0.a)
   WHERE cmv_basetable_2_n0.c > 10.0
@@ -221,7 +221,7 @@ PREHOOK: Input: default@cmv_basetable_2_n0
 PREHOOK: Input: default@cmv_basetable_n1
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n1
-POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n1 ENABLE REWRITE AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n1 AS
   SELECT cmv_basetable_n1.a, cmv_basetable_2_n0.c
   FROM cmv_basetable_n1 JOIN cmv_basetable_2_n0 ON (cmv_basetable_n1.a = cmv_basetable_2_n0.a)
   WHERE cmv_basetable_2_n0.c > 10.0

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
index f82aa10..cfff416 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
@@ -73,14 +73,14 @@ POSTHOOK: Input: default@cmv_basetable_2_n1
 POSTHOOK: Output: default@cmv_basetable_2_n1
 #### A masked pattern was here ####
 PREHOOK: query: EXPLAIN
-CREATE MATERIALIZED VIEW cmv_mat_view_n3 TBLPROPERTIES('rewriting.time.window'='300s') AS
+CREATE MATERIALIZED VIEW cmv_mat_view_n3 DISABLE REWRITE TBLPROPERTIES('rewriting.time.window'='300s') AS
   SELECT cmv_basetable_n3.a, cmv_basetable_2_n1.c
   FROM cmv_basetable_n3 JOIN cmv_basetable_2_n1 ON (cmv_basetable_n3.a = cmv_basetable_2_n1.a)
   WHERE cmv_basetable_2_n1.c > 10.0
   GROUP BY cmv_basetable_n3.a, cmv_basetable_2_n1.c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: query: EXPLAIN
-CREATE MATERIALIZED VIEW cmv_mat_view_n3 TBLPROPERTIES('rewriting.time.window'='300s') AS
+CREATE MATERIALIZED VIEW cmv_mat_view_n3 DISABLE REWRITE TBLPROPERTIES('rewriting.time.window'='300s') AS
   SELECT cmv_basetable_n3.a, cmv_basetable_2_n1.c
   FROM cmv_basetable_n3 JOIN cmv_basetable_2_n1 ON (cmv_basetable_n3.a = cmv_basetable_2_n1.a)
   WHERE cmv_basetable_2_n1.c > 10.0
@@ -212,7 +212,7 @@ STAGE PLANS:
           hdfs directory: true
 #### A masked pattern was here ####
 
-PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n3 TBLPROPERTIES('rewriting.time.window'='300s') AS
+PREHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n3 DISABLE REWRITE TBLPROPERTIES('rewriting.time.window'='300s') AS
   SELECT cmv_basetable_n3.a, cmv_basetable_2_n1.c
   FROM cmv_basetable_n3 JOIN cmv_basetable_2_n1 ON (cmv_basetable_n3.a = cmv_basetable_2_n1.a)
   WHERE cmv_basetable_2_n1.c > 10.0
@@ -222,7 +222,7 @@ PREHOOK: Input: default@cmv_basetable_2_n1
 PREHOOK: Input: default@cmv_basetable_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n3
-POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n3 TBLPROPERTIES('rewriting.time.window'='300s') AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW cmv_mat_view_n3 DISABLE REWRITE TBLPROPERTIES('rewriting.time.window'='300s') AS
   SELECT cmv_basetable_n3.a, cmv_basetable_2_n1.c
   FROM cmv_basetable_n3 JOIN cmv_basetable_2_n1 ON (cmv_basetable_n3.a = cmv_basetable_2_n1.a)
   WHERE cmv_basetable_2_n1.c > 10.0

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
index 70addc4..7cf7132 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
@@ -17,14 +17,14 @@ POSTHOOK: Output: default@cmv_basetable_n8
 POSTHOOK: Lineage: cmv_basetable_n8.a SCRIPT []
 POSTHOOK: Lineage: cmv_basetable_n8.b SCRIPT []
 POSTHOOK: Lineage: cmv_basetable_n8.c SCRIPT []
-PREHOOK: query: create materialized view cmv_mat_view_n8
+PREHOOK: query: create materialized view cmv_mat_view_n8 disable rewrite
 comment 'this is the first view'
 tblproperties ('key'='foo') as select a, c from cmv_basetable_n8
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n8
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view_n8
-POSTHOOK: query: create materialized view cmv_mat_view_n8
+POSTHOOK: query: create materialized view cmv_mat_view_n8 disable rewrite
 comment 'this is the first view'
 tblproperties ('key'='foo') as select a, c from cmv_basetable_n8
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -123,7 +123,7 @@ POSTHOOK: query: drop materialized view cmv_mat_view_n8
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_mat_view_n8
 POSTHOOK: Output: default@cmv_mat_view_n8
-PREHOOK: query: create materialized view cmv_mat_view2_n3
+PREHOOK: query: create materialized view cmv_mat_view2_n3 disable rewrite
 comment 'this is the second view'
 stored as textfile
 tblproperties ('key'='alice','key2'='bob') as select a from cmv_basetable_n8
@@ -131,7 +131,7 @@ PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n8
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view2_n3
-POSTHOOK: query: create materialized view cmv_mat_view2_n3
+POSTHOOK: query: create materialized view cmv_mat_view2_n3 disable rewrite
 comment 'this is the second view'
 stored as textfile
 tblproperties ('key'='alice','key2'='bob') as select a from cmv_basetable_n8
@@ -200,7 +200,7 @@ POSTHOOK: query: drop materialized view cmv_mat_view2_n3
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_mat_view2_n3
 POSTHOOK: Output: default@cmv_mat_view2_n3
-PREHOOK: query: create materialized view cmv_mat_view3_n0
+PREHOOK: query: create materialized view cmv_mat_view3_n0 disable rewrite
 comment 'this is the third view'
 row format
   delimited fields terminated by '\t'
@@ -209,7 +209,7 @@ PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_basetable_n8
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view3_n0
-POSTHOOK: query: create materialized view cmv_mat_view3_n0
+POSTHOOK: query: create materialized view cmv_mat_view3_n0 disable rewrite
 comment 'this is the third view'
 row format
   delimited fields terminated by '\t'
@@ -290,7 +290,7 @@ POSTHOOK: query: drop materialized view cmv_mat_view3_n0
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@cmv_mat_view3_n0
 POSTHOOK: Output: default@cmv_mat_view3_n0
-PREHOOK: query: create materialized view cmv_mat_view4_n0
+PREHOOK: query: create materialized view cmv_mat_view4_n0 disable rewrite
 comment 'this is the last view'
 stored as textfile
 #### A masked pattern was here ####
@@ -300,7 +300,7 @@ PREHOOK: Input: default@cmv_basetable_n8
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cmv_mat_view4_n0
-POSTHOOK: query: create materialized view cmv_mat_view4_n0
+POSTHOOK: query: create materialized view cmv_mat_view4_n0 disable rewrite
 comment 'this is the last view'
 stored as textfile
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_drop.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_drop.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_drop.q.out
index 441f105..97c67e0 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_drop.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_drop.q.out
@@ -1,9 +1,9 @@
-PREHOOK: query: create materialized view dmv_mat_view as select cint, cstring1 from alltypesorc where cint < 0
+PREHOOK: query: create materialized view dmv_mat_view disable rewrite as select cint, cstring1 from alltypesorc where cint < 0
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dmv_mat_view
-POSTHOOK: query: create materialized view dmv_mat_view as select cint, cstring1 from alltypesorc where cint < 0
+POSTHOOK: query: create materialized view dmv_mat_view disable rewrite as select cint, cstring1 from alltypesorc where cint < 0
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@alltypesorc
 POSTHOOK: Output: database:default

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_1.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_1.q.out
index a7ea753..16b199b 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_1.q.out
@@ -172,13 +172,13 @@ PREHOOK: query: alter table depts_n2 add constraint fk2 foreign key (locationid)
 PREHOOK: type: ALTERTABLE_ADDCONSTRAINT
 POSTHOOK: query: alter table depts_n2 add constraint fk2 foreign key (locationid) references locations_n2(locationid) disable novalidate rely
 POSTHOOK: type: ALTERTABLE_ADDCONSTRAINT
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select * from emps_n3 where empid < 150
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select * from emps_n3 where empid < 150
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@emps_n3
@@ -309,14 +309,14 @@ POSTHOOK: query: drop materialized view mv1_n2
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n2
 POSTHOOK: Output: default@mv1_n2
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select deptno, name, salary, commission
 from emps_n3
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select deptno, name, salary, commission
 from emps_n3
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -449,7 +449,7 @@ POSTHOOK: query: drop materialized view mv1_n2
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n2
 POSTHOOK: Output: default@mv1_n2
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select empid deptno from emps_n3
 join depts_n2 using (deptno)
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -457,7 +457,7 @@ PREHOOK: Input: default@depts_n2
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select empid deptno from emps_n3
 join depts_n2 using (deptno)
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -522,13 +522,13 @@ POSTHOOK: query: drop materialized view mv1_n2
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n2
 POSTHOOK: Output: default@mv1_n2
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select * from emps_n3 where empid < 200
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select * from emps_n3 where empid < 200
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@emps_n3
@@ -641,13 +641,13 @@ POSTHOOK: query: drop materialized view mv1_n2
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n2
 POSTHOOK: Output: default@mv1_n2
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select empid, deptno from emps_n3 group by empid, deptno
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select empid, deptno from emps_n3 group by empid, deptno
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@emps_n3
@@ -705,13 +705,13 @@ POSTHOOK: query: drop materialized view mv1_n2
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n2
 POSTHOOK: Output: default@mv1_n2
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select empid, name from emps_n3 group by empid, name
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select empid, name from emps_n3 group by empid, name
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@emps_n3
@@ -769,13 +769,13 @@ POSTHOOK: query: drop materialized view mv1_n2
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n2
 POSTHOOK: Output: default@mv1_n2
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select name, salary from emps_n3 group by name, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select name, salary from emps_n3 group by name, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@emps_n3
@@ -834,13 +834,13 @@ POSTHOOK: query: drop materialized view mv1_n2
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n2
 POSTHOOK: Output: default@mv1_n2
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select name, salary from emps_n3 group by name, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select name, salary from emps_n3 group by name, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@emps_n3
@@ -939,13 +939,13 @@ POSTHOOK: query: drop materialized view mv1_n2
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n2
 POSTHOOK: Output: default@mv1_n2
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select name, salary from emps_n3 where deptno = 10 group by name, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select name, salary from emps_n3 where deptno = 10 group by name, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@emps_n3
@@ -1043,14 +1043,14 @@ POSTHOOK: query: drop materialized view mv1_n2
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n2
 POSTHOOK: Output: default@mv1_n2
-PREHOOK: query: create materialized view mv1_n2 enable rewrite as
+PREHOOK: query: create materialized view mv1_n2 as
 select name, salary, count(*) as c, sum(empid) as s
 from emps_n3 group by name, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n3
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n2
-POSTHOOK: query: create materialized view mv1_n2 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n2 as
 select name, salary, count(*) as c, sum(empid) as s
 from emps_n3 group by name, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_2.q.out
index eea0686..2d5764b 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_2.q.out
@@ -172,7 +172,7 @@ PREHOOK: query: alter table depts_n0 add constraint fk2 foreign key (locationid)
 PREHOOK: type: ALTERTABLE_ADDCONSTRAINT
 POSTHOOK: query: alter table depts_n0 add constraint fk2 foreign key (locationid) references locations_n0(locationid) disable novalidate rely
 POSTHOOK: type: ALTERTABLE_ADDCONSTRAINT
-PREHOOK: query: create materialized view mv1_n0 enable rewrite as
+PREHOOK: query: create materialized view mv1_n0 as
 select empid, depts_n0.deptno from emps_n0
 join depts_n0 using (deptno) where depts_n0.deptno > 10
 group by empid, depts_n0.deptno
@@ -181,7 +181,7 @@ PREHOOK: Input: default@depts_n0
 PREHOOK: Input: default@emps_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n0
-POSTHOOK: query: create materialized view mv1_n0 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n0 as
 select empid, depts_n0.deptno from emps_n0
 join depts_n0 using (deptno) where depts_n0.deptno > 10
 group by empid, depts_n0.deptno
@@ -251,7 +251,7 @@ POSTHOOK: query: drop materialized view mv1_n0
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n0
 POSTHOOK: Output: default@mv1_n0
-PREHOOK: query: create materialized view mv1_n0 enable rewrite as
+PREHOOK: query: create materialized view mv1_n0 as
 select depts_n0.deptno, empid from depts_n0
 join emps_n0 using (deptno) where depts_n0.deptno > 10
 group by empid, depts_n0.deptno
@@ -260,7 +260,7 @@ PREHOOK: Input: default@depts_n0
 PREHOOK: Input: default@emps_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n0
-POSTHOOK: query: create materialized view mv1_n0 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n0 as
 select depts_n0.deptno, empid from depts_n0
 join emps_n0 using (deptno) where depts_n0.deptno > 10
 group by empid, depts_n0.deptno
@@ -330,7 +330,7 @@ POSTHOOK: query: drop materialized view mv1_n0
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n0
 POSTHOOK: Output: default@mv1_n0
-PREHOOK: query: create materialized view mv1_n0 enable rewrite as
+PREHOOK: query: create materialized view mv1_n0 as
 select empid, depts_n0.deptno from emps_n0
 join depts_n0 using (deptno) where emps_n0.deptno > 10
 group by empid, depts_n0.deptno
@@ -339,7 +339,7 @@ PREHOOK: Input: default@depts_n0
 PREHOOK: Input: default@emps_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n0
-POSTHOOK: query: create materialized view mv1_n0 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n0 as
 select empid, depts_n0.deptno from emps_n0
 join depts_n0 using (deptno) where emps_n0.deptno > 10
 group by empid, depts_n0.deptno
@@ -409,7 +409,7 @@ POSTHOOK: query: drop materialized view mv1_n0
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n0
 POSTHOOK: Output: default@mv1_n0
-PREHOOK: query: create materialized view mv1_n0 enable rewrite as
+PREHOOK: query: create materialized view mv1_n0 as
 select depts_n0.deptno, emps_n0.empid from depts_n0
 join emps_n0 using (deptno) where emps_n0.empid > 10
 group by depts_n0.deptno, emps_n0.empid
@@ -418,7 +418,7 @@ PREHOOK: Input: default@depts_n0
 PREHOOK: Input: default@emps_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n0
-POSTHOOK: query: create materialized view mv1_n0 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n0 as
 select depts_n0.deptno, emps_n0.empid from depts_n0
 join emps_n0 using (deptno) where emps_n0.empid > 10
 group by depts_n0.deptno, emps_n0.empid
@@ -493,7 +493,7 @@ POSTHOOK: query: drop materialized view mv1_n0
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n0
 POSTHOOK: Output: default@mv1_n0
-PREHOOK: query: create materialized view mv1_n0 enable rewrite as
+PREHOOK: query: create materialized view mv1_n0 as
 select depts_n0.deptno, emps_n0.empid from depts_n0
 join emps_n0 using (deptno) where emps_n0.empid > 10
 group by depts_n0.deptno, emps_n0.empid
@@ -502,7 +502,7 @@ PREHOOK: Input: default@depts_n0
 PREHOOK: Input: default@emps_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n0
-POSTHOOK: query: create materialized view mv1_n0 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n0 as
 select depts_n0.deptno, emps_n0.empid from depts_n0
 join emps_n0 using (deptno) where emps_n0.empid > 10
 group by depts_n0.deptno, emps_n0.empid
@@ -616,7 +616,7 @@ POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n0
 POSTHOOK: Output: default@mv1_n0
 Warning: Shuffle Join MERGEJOIN[18][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: create materialized view mv1_n0 enable rewrite as
+PREHOOK: query: create materialized view mv1_n0 as
 select depts_n0.name, dependents_n0.name as name2, emps_n0.deptno, depts_n0.deptno as deptno2, dependents_n0.empid
 from depts_n0, dependents_n0, emps_n0
 where depts_n0.deptno > 10
@@ -627,7 +627,7 @@ PREHOOK: Input: default@depts_n0
 PREHOOK: Input: default@emps_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n0
-POSTHOOK: query: create materialized view mv1_n0 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n0 as
 select depts_n0.name, dependents_n0.name as name2, emps_n0.deptno, depts_n0.deptno as deptno2, dependents_n0.empid
 from depts_n0, dependents_n0, emps_n0
 where depts_n0.deptno > 10

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_3.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_3.q.out
index 951e30c..5965d31 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_3.q.out
@@ -172,7 +172,7 @@ PREHOOK: query: alter table depts_n7 add constraint fk2 foreign key (locationid)
 PREHOOK: type: ALTERTABLE_ADDCONSTRAINT
 POSTHOOK: query: alter table depts_n7 add constraint fk2 foreign key (locationid) references locations_n5(locationid) disable novalidate rely
 POSTHOOK: type: ALTERTABLE_ADDCONSTRAINT
-PREHOOK: query: create materialized view mv1_n5 enable rewrite as
+PREHOOK: query: create materialized view mv1_n5 as
 select empid deptno from emps_n9
 join depts_n7 using (deptno)
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -180,7 +180,7 @@ PREHOOK: Input: default@depts_n7
 PREHOOK: Input: default@emps_n9
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n5
-POSTHOOK: query: create materialized view mv1_n5 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n5 as
 select empid deptno from emps_n9
 join depts_n7 using (deptno)
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -245,7 +245,7 @@ POSTHOOK: query: drop materialized view mv1_n5
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n5
 POSTHOOK: Output: default@mv1_n5
-PREHOOK: query: create materialized view mv1_n5 enable rewrite as
+PREHOOK: query: create materialized view mv1_n5 as
 select cast(empid as BIGINT) from emps_n9
 join depts_n7 using (deptno)
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -253,7 +253,7 @@ PREHOOK: Input: default@depts_n7
 PREHOOK: Input: default@emps_n9
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n5
-POSTHOOK: query: create materialized view mv1_n5 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n5 as
 select cast(empid as BIGINT) from emps_n9
 join depts_n7 using (deptno)
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -322,7 +322,7 @@ POSTHOOK: query: drop materialized view mv1_n5
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n5
 POSTHOOK: Output: default@mv1_n5
-PREHOOK: query: create materialized view mv1_n5 enable rewrite as
+PREHOOK: query: create materialized view mv1_n5 as
 select cast(empid as BIGINT) from emps_n9
 join depts_n7 using (deptno)
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -330,7 +330,7 @@ PREHOOK: Input: default@depts_n7
 PREHOOK: Input: default@emps_n9
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n5
-POSTHOOK: query: create materialized view mv1_n5 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n5 as
 select cast(empid as BIGINT) from emps_n9
 join depts_n7 using (deptno)
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -395,7 +395,7 @@ POSTHOOK: query: drop materialized view mv1_n5
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n5
 POSTHOOK: Output: default@mv1_n5
-PREHOOK: query: create materialized view mv1_n5 enable rewrite as
+PREHOOK: query: create materialized view mv1_n5 as
 select depts_n7.name
 from emps_n9
 join depts_n7 on (emps_n9.deptno = depts_n7.deptno)
@@ -404,7 +404,7 @@ PREHOOK: Input: default@depts_n7
 PREHOOK: Input: default@emps_n9
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n5
-POSTHOOK: query: create materialized view mv1_n5 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n5 as
 select depts_n7.name
 from emps_n9
 join depts_n7 on (emps_n9.deptno = depts_n7.deptno)

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_4.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_4.q.out
index bebff26..a0a22bf 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_4.q.out
@@ -172,14 +172,14 @@ PREHOOK: query: alter table depts_n4 add constraint fk2 foreign key (locationid)
 PREHOOK: type: ALTERTABLE_ADDCONSTRAINT
 POSTHOOK: query: alter table depts_n4 add constraint fk2 foreign key (locationid) references locations_n3(locationid) disable novalidate rely
 POSTHOOK: type: ALTERTABLE_ADDCONSTRAINT
-PREHOOK: query: create materialized view mv1_n3 enable rewrite as
+PREHOOK: query: create materialized view mv1_n3 as
 select name, salary, count(*) as c, sum(empid) as s
 from emps_n5 group by name, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n5
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n3
-POSTHOOK: query: create materialized view mv1_n3 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n3 as
 select name, salary, count(*) as c, sum(empid) as s
 from emps_n5 group by name, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -286,14 +286,14 @@ POSTHOOK: query: drop materialized view mv1_n3
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n3
 POSTHOOK: Output: default@mv1_n3
-PREHOOK: query: create materialized view mv1_n3 enable rewrite as
+PREHOOK: query: create materialized view mv1_n3 as
 select name, salary, count(*) as c, sum(empid) as s
 from emps_n5 group by name, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n5
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n3
-POSTHOOK: query: create materialized view mv1_n3 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n3 as
 select name, salary, count(*) as c, sum(empid) as s
 from emps_n5 group by name, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -357,7 +357,7 @@ POSTHOOK: query: drop materialized view mv1_n3
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n3
 POSTHOOK: Output: default@mv1_n3
-PREHOOK: query: create materialized view mv1_n3 enable rewrite as
+PREHOOK: query: create materialized view mv1_n3 as
 select empid, emps_n5.deptno, count(*) as c, sum(empid) as s
 from emps_n5 join depts_n4 using (deptno)
 group by empid, emps_n5.deptno
@@ -366,7 +366,7 @@ PREHOOK: Input: default@depts_n4
 PREHOOK: Input: default@emps_n5
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n3
-POSTHOOK: query: create materialized view mv1_n3 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n3 as
 select empid, emps_n5.deptno, count(*) as c, sum(empid) as s
 from emps_n5 join depts_n4 using (deptno)
 group by empid, emps_n5.deptno
@@ -479,7 +479,7 @@ POSTHOOK: query: drop materialized view mv1_n3
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n3
 POSTHOOK: Output: default@mv1_n3
-PREHOOK: query: create materialized view mv1_n3 enable rewrite as
+PREHOOK: query: create materialized view mv1_n3 as
 select empid, emps_n5.deptno, count(*) as c, sum(empid) as s
 from emps_n5 join depts_n4 using (deptno)
 where emps_n5.deptno >= 10 group by empid, emps_n5.deptno
@@ -488,7 +488,7 @@ PREHOOK: Input: default@depts_n4
 PREHOOK: Input: default@emps_n5
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n3
-POSTHOOK: query: create materialized view mv1_n3 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n3 as
 select empid, emps_n5.deptno, count(*) as c, sum(empid) as s
 from emps_n5 join depts_n4 using (deptno)
 where emps_n5.deptno >= 10 group by empid, emps_n5.deptno
@@ -599,7 +599,7 @@ POSTHOOK: query: drop materialized view mv1_n3
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n3
 POSTHOOK: Output: default@mv1_n3
-PREHOOK: query: create materialized view mv1_n3 enable rewrite as
+PREHOOK: query: create materialized view mv1_n3 as
 select empid, depts_n4.deptno, count(*) + 1 as c, sum(empid) as s
 from emps_n5 join depts_n4 using (deptno)
 where depts_n4.deptno >= 10 group by empid, depts_n4.deptno
@@ -608,7 +608,7 @@ PREHOOK: Input: default@depts_n4
 PREHOOK: Input: default@emps_n5
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n3
-POSTHOOK: query: create materialized view mv1_n3 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n3 as
 select empid, depts_n4.deptno, count(*) + 1 as c, sum(empid) as s
 from emps_n5 join depts_n4 using (deptno)
 where depts_n4.deptno >= 10 group by empid, depts_n4.deptno
@@ -727,7 +727,7 @@ POSTHOOK: query: drop materialized view mv1_n3
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n3
 POSTHOOK: Output: default@mv1_n3
-PREHOOK: query: create materialized view mv1_n3 enable rewrite as
+PREHOOK: query: create materialized view mv1_n3 as
 select depts_n4.name, sum(salary) as s
 from emps_n5
 join depts_n4 on (emps_n5.deptno = depts_n4.deptno)
@@ -737,7 +737,7 @@ PREHOOK: Input: default@depts_n4
 PREHOOK: Input: default@emps_n5
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n3
-POSTHOOK: query: create materialized view mv1_n3 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n3 as
 select depts_n4.name, sum(salary) as s
 from emps_n5
 join depts_n4 on (emps_n5.deptno = depts_n4.deptno)
@@ -900,7 +900,7 @@ POSTHOOK: query: drop materialized view mv1_n3
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n3
 POSTHOOK: Output: default@mv1_n3
-PREHOOK: query: create materialized view mv1_n3 enable rewrite as
+PREHOOK: query: create materialized view mv1_n3 as
 select dependents_n3.empid, emps_n5.deptno, count(distinct salary) as s
 from emps_n5
 join dependents_n3 on (emps_n5.empid = dependents_n3.empid)
@@ -910,7 +910,7 @@ PREHOOK: Input: default@dependents_n3
 PREHOOK: Input: default@emps_n5
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n3
-POSTHOOK: query: create materialized view mv1_n3 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n3 as
 select dependents_n3.empid, emps_n5.deptno, count(distinct salary) as s
 from emps_n5
 join dependents_n3 on (emps_n5.empid = dependents_n3.empid)

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_5.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_5.q.out
index 8c080f9..6718e3f 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_5.q.out
@@ -188,13 +188,13 @@ POSTHOOK: query: alter table depts_n1 change column locationid locationid int co
 POSTHOOK: type: ALTERTABLE_RENAMECOL
 POSTHOOK: Input: default@depts_n1
 POSTHOOK: Output: default@depts_n1
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select name, deptno, salary from emps_n2 where deptno > 15 group by name, deptno, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select name, deptno, salary from emps_n2 where deptno > 15 group by name, deptno, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@emps_n2
@@ -293,14 +293,14 @@ POSTHOOK: query: drop materialized view mv1_n1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select name, deptno, salary, count(*) as c, sum(empid) as s
 from emps_n2 where deptno >= 15 group by name, deptno, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select name, deptno, salary, count(*) as c, sum(empid) as s
 from emps_n2 where deptno >= 15 group by name, deptno, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -407,7 +407,7 @@ POSTHOOK: query: drop materialized view mv1_n1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select depts_n1.deptno, dependents_n1.empid
 from depts_n1
 join dependents_n1 on (depts_n1.name = dependents_n1.name)
@@ -422,7 +422,7 @@ PREHOOK: Input: default@emps_n2
 PREHOOK: Input: default@locations_n1
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select depts_n1.deptno, dependents_n1.empid
 from depts_n1
 join dependents_n1 on (depts_n1.name = dependents_n1.name)
@@ -559,7 +559,7 @@ POSTHOOK: query: drop materialized view mv1_n1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select empid, depts_n1.deptno, count(*) as c, sum(empid) as s
 from emps_n2 join depts_n1 using (deptno)
 group by empid, depts_n1.deptno
@@ -568,7 +568,7 @@ PREHOOK: Input: default@depts_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select empid, depts_n1.deptno, count(*) as c, sum(empid) as s
 from emps_n2 join depts_n1 using (deptno)
 group by empid, depts_n1.deptno
@@ -668,7 +668,7 @@ POSTHOOK: query: drop materialized view mv1_n1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select empid, depts_n1.deptno, count(*) as c, sum(empid) as s
 from emps_n2 join depts_n1 using (deptno)
 group by empid, depts_n1.deptno
@@ -677,7 +677,7 @@ PREHOOK: Input: default@depts_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select empid, depts_n1.deptno, count(*) as c, sum(empid) as s
 from emps_n2 join depts_n1 using (deptno)
 group by empid, depts_n1.deptno
@@ -743,7 +743,7 @@ POSTHOOK: query: drop materialized view mv1_n1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select dependents_n1.empid, emps_n2.deptno, sum(salary) as s
 from emps_n2
 join dependents_n1 on (emps_n2.empid = dependents_n1.empid)
@@ -753,7 +753,7 @@ PREHOOK: Input: default@dependents_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select dependents_n1.empid, emps_n2.deptno, sum(salary) as s
 from emps_n2
 join dependents_n1 on (emps_n2.empid = dependents_n1.empid)
@@ -909,7 +909,7 @@ POSTHOOK: query: drop materialized view mv1_n1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select dependents_n1.empid, emps_n2.deptno, sum(salary) as s
 from emps_n2
 join dependents_n1 on (emps_n2.empid = dependents_n1.empid)
@@ -919,7 +919,7 @@ PREHOOK: Input: default@dependents_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select dependents_n1.empid, emps_n2.deptno, sum(salary) as s
 from emps_n2
 join dependents_n1 on (emps_n2.empid = dependents_n1.empid)
@@ -1077,7 +1077,7 @@ POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
 Warning: Shuffle Join MERGEJOIN[22][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select a.empid deptno from
 (select * from emps_n2 where empid = 1) a
 join depts_n1 on (a.deptno = depts_n1.deptno)
@@ -1088,7 +1088,7 @@ PREHOOK: Input: default@depts_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select a.empid deptno from
 (select * from emps_n2 where empid = 1) a
 join depts_n1 on (a.deptno = depts_n1.deptno)
@@ -1159,7 +1159,7 @@ POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
 Warning: Shuffle Join MERGEJOIN[22][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select a.empid, a.deptno from
 (select * from emps_n2 where empid = 1) a
 join depts_n1 on (a.deptno = depts_n1.deptno)
@@ -1170,7 +1170,7 @@ PREHOOK: Input: default@depts_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select a.empid, a.deptno from
 (select * from emps_n2 where empid = 1) a
 join depts_n1 on (a.deptno = depts_n1.deptno)
@@ -1240,7 +1240,7 @@ POSTHOOK: query: drop materialized view mv1_n1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select empid deptno from
 (select * from emps_n2 where empid = 1) a
 join depts_n1 on (a.deptno = depts_n1.deptno)
@@ -1249,7 +1249,7 @@ PREHOOK: Input: default@depts_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select empid deptno from
 (select * from emps_n2 where empid = 1) a
 join depts_n1 on (a.deptno = depts_n1.deptno)
@@ -1308,7 +1308,7 @@ POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
 Warning: Shuffle Join MERGEJOIN[22][tables = [$hdt$_1, $hdt$_2, $hdt$_0]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select emps_n2.empid, emps_n2.deptno from emps_n2
 join depts_n1 on (emps_n2.deptno = depts_n1.deptno)
 join dependents_n1 on (emps_n2.empid = dependents_n1.empid)
@@ -1319,7 +1319,7 @@ PREHOOK: Input: default@depts_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select emps_n2.empid, emps_n2.deptno from emps_n2
 join depts_n1 on (emps_n2.deptno = depts_n1.deptno)
 join dependents_n1 on (emps_n2.empid = dependents_n1.empid)
@@ -1390,7 +1390,7 @@ POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
 Warning: Shuffle Join MERGEJOIN[30][tables = [$hdt$_2, $hdt$_3, $hdt$_1, $hdt$_0]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select emps_n2.empid, emps_n2.deptno from emps_n2
 join depts_n1 a on (emps_n2.deptno=a.deptno)
 join depts_n1 b on (emps_n2.deptno=b.deptno)
@@ -1402,7 +1402,7 @@ PREHOOK: Input: default@depts_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select emps_n2.empid, emps_n2.deptno from emps_n2
 join depts_n1 a on (emps_n2.deptno=a.deptno)
 join depts_n1 b on (emps_n2.deptno=b.deptno)
@@ -1473,7 +1473,7 @@ POSTHOOK: query: drop materialized view mv1_n1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n1
 POSTHOOK: Output: default@mv1_n1
-PREHOOK: query: create materialized view mv1_n1 enable rewrite as
+PREHOOK: query: create materialized view mv1_n1 as
 select emps_n2.empid, emps_n2.deptno from emps_n2
 join depts_n1 a on (emps_n2.deptno=a.deptno)
 join depts_n1 b on (emps_n2.deptno=b.deptno)
@@ -1485,7 +1485,7 @@ PREHOOK: Input: default@depts_n1
 PREHOOK: Input: default@emps_n2
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n1
-POSTHOOK: query: create materialized view mv1_n1 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n1 as
 select emps_n2.empid, emps_n2.deptno from emps_n2
 join depts_n1 a on (emps_n2.deptno=a.deptno)
 join depts_n1 b on (emps_n2.deptno=b.deptno)

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_6.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_6.q.out
index 4cb36a0..77887e0 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_6.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_6.q.out
@@ -188,14 +188,14 @@ POSTHOOK: query: alter table depts change column locationid locationid int const
 POSTHOOK: type: ALTERTABLE_RENAMECOL
 POSTHOOK: Input: default@depts
 POSTHOOK: Output: default@depts
-PREHOOK: query: create materialized view mv1 enable rewrite as
+PREHOOK: query: create materialized view mv1 as
 select name, deptno, salary, count(*) + 1 as c, sum(empid) as s
 from emps where deptno >= 10 group by name, deptno, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1
-POSTHOOK: query: create materialized view mv1 enable rewrite as
+POSTHOOK: query: create materialized view mv1 as
 select name, deptno, salary, count(*) + 1 as c, sum(empid) as s
 from emps where deptno >= 10 group by name, deptno, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -306,14 +306,14 @@ POSTHOOK: query: drop materialized view mv1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1
 POSTHOOK: Output: default@mv1
-PREHOOK: query: create materialized view mv1 enable rewrite as
+PREHOOK: query: create materialized view mv1 as
 select name, deptno, salary, count(*) + 1 as c, sum(empid) as s
 from emps where deptno >= 15 group by name, deptno, salary
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@emps
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1
-POSTHOOK: query: create materialized view mv1 enable rewrite as
+POSTHOOK: query: create materialized view mv1 as
 select name, deptno, salary, count(*) + 1 as c, sum(empid) as s
 from emps where deptno >= 15 group by name, deptno, salary
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -424,7 +424,7 @@ POSTHOOK: query: drop materialized view mv1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1
 POSTHOOK: Output: default@mv1
-PREHOOK: query: create materialized view mv1 enable rewrite as
+PREHOOK: query: create materialized view mv1 as
 select depts.name
 from emps
 join depts on (emps.deptno = depts.deptno)
@@ -433,7 +433,7 @@ PREHOOK: Input: default@depts
 PREHOOK: Input: default@emps
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1
-POSTHOOK: query: create materialized view mv1 enable rewrite as
+POSTHOOK: query: create materialized view mv1 as
 select depts.name
 from emps
 join depts on (emps.deptno = depts.deptno)
@@ -572,7 +572,7 @@ POSTHOOK: query: drop materialized view mv1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1
 POSTHOOK: Output: default@mv1
-PREHOOK: query: create materialized view mv1 enable rewrite as
+PREHOOK: query: create materialized view mv1 as
 select depts.name
 from emps
 join depts on (emps.deptno = depts.deptno)
@@ -581,7 +581,7 @@ PREHOOK: Input: default@depts
 PREHOOK: Input: default@emps
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1
-POSTHOOK: query: create materialized view mv1 enable rewrite as
+POSTHOOK: query: create materialized view mv1 as
 select depts.name
 from emps
 join depts on (emps.deptno = depts.deptno)
@@ -747,7 +747,7 @@ POSTHOOK: query: drop materialized view mv1
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1
 POSTHOOK: Output: default@mv1
-PREHOOK: query: create materialized view mv1 enable rewrite as
+PREHOOK: query: create materialized view mv1 as
 select emps.empid, emps.deptno, emps.name as name1, emps.salary, emps.commission, dependents.name as name2
 from emps join dependents on (emps.empid = dependents.empid)
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -755,7 +755,7 @@ PREHOOK: Input: default@dependents
 PREHOOK: Input: default@emps
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1
-POSTHOOK: query: create materialized view mv1 enable rewrite as
+POSTHOOK: query: create materialized view mv1 as
 select emps.empid, emps.deptno, emps.name as name1, emps.salary, emps.commission, dependents.name as name2
 from emps join dependents on (emps.empid = dependents.empid)
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_7.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_7.q.out
index 71422fa..f677a6c 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_7.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_7.q.out
@@ -188,7 +188,7 @@ POSTHOOK: query: alter table depts_n6 change column locationid locationid int co
 POSTHOOK: type: ALTERTABLE_RENAMECOL
 POSTHOOK: Input: default@depts_n6
 POSTHOOK: Output: default@depts_n6
-PREHOOK: query: create materialized view mv1_n4 enable rewrite as
+PREHOOK: query: create materialized view mv1_n4 as
 select depts_n6.deptno, dependents_n4.empid
 from depts_n6
 join dependents_n4 on (depts_n6.name = dependents_n4.name)
@@ -203,7 +203,7 @@ PREHOOK: Input: default@emps_n8
 PREHOOK: Input: default@locations_n4
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n4
-POSTHOOK: query: create materialized view mv1_n4 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n4 as
 select depts_n6.deptno, dependents_n4.empid
 from depts_n6
 join dependents_n4 on (depts_n6.name = dependents_n4.name)
@@ -479,7 +479,7 @@ POSTHOOK: query: drop materialized view mv1_n4
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n4
 POSTHOOK: Output: default@mv1_n4
-PREHOOK: query: create materialized view mv1_n4 enable rewrite as
+PREHOOK: query: create materialized view mv1_n4 as
 select depts_n6.deptno, dependents_n4.empid, count(emps_n8.salary) as s
 from depts_n6
 join dependents_n4 on (depts_n6.name = dependents_n4.name)
@@ -494,7 +494,7 @@ PREHOOK: Input: default@emps_n8
 PREHOOK: Input: default@locations_n4
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n4
-POSTHOOK: query: create materialized view mv1_n4 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n4 as
 select depts_n6.deptno, dependents_n4.empid, count(emps_n8.salary) as s
 from depts_n6
 join dependents_n4 on (depts_n6.name = dependents_n4.name)
@@ -804,7 +804,7 @@ POSTHOOK: query: drop materialized view mv1_n4
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@mv1_n4
 POSTHOOK: Output: default@mv1_n4
-PREHOOK: query: create materialized view mv1_n4 enable rewrite as
+PREHOOK: query: create materialized view mv1_n4 as
 select depts_n6.deptno, dependents_n4.empid
 from depts_n6
 join dependents_n4 on (depts_n6.name = dependents_n4.name)
@@ -816,7 +816,7 @@ PREHOOK: Input: default@depts_n6
 PREHOOK: Input: default@emps_n8
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mv1_n4
-POSTHOOK: query: create materialized view mv1_n4 enable rewrite as
+POSTHOOK: query: create materialized view mv1_n4 as
 select depts_n6.deptno, dependents_n4.empid
 from depts_n6
 join dependents_n4 on (depts_n6.name = dependents_n4.name)

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_8.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_8.q.out
index 5ac6484..72f327e 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_8.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_8.q.out
@@ -50,7 +50,7 @@ POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@source_table_001
 POSTHOOK: Output: default@source_table_001
 #### A masked pattern was here ####
-PREHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv ENABLE REWRITE AS
+PREHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv AS
 SELECT
 SUM(A.DOWN_VOLUME) AS DOWN_VOLUME_SUM,
 SUM(A.UP_VOLUME) AS UP_VOLUME_SUM,
@@ -61,7 +61,7 @@ PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@source_table_001
 PREHOOK: Output: database:default
 PREHOOK: Output: default@source_table_001_mv
-POSTHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv ENABLE REWRITE AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv AS
 SELECT
 SUM(A.DOWN_VOLUME) AS DOWN_VOLUME_SUM,
 SUM(A.UP_VOLUME) AS UP_VOLUME_SUM,

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_9.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_9.q.out
index 944f9ef..e889ebd 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_9.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_9.q.out
@@ -50,7 +50,7 @@ POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@source_table_001_n0
 POSTHOOK: Output: default@source_table_001_n0
 #### A masked pattern was here ####
-PREHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv_n0 ENABLE REWRITE AS
+PREHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv_n0 AS
 SELECT
 SUM(A.DOWN_VOLUME) AS DOWN_VOLUME_SUM,
 SUM(A.UP_VOLUME) AS UP_VOLUME_SUM,
@@ -61,7 +61,7 @@ PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@source_table_001_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@source_table_001_mv_n0
-POSTHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv_n0 ENABLE REWRITE AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv_n0 AS
 SELECT
 SUM(A.DOWN_VOLUME) AS DOWN_VOLUME_SUM,
 SUM(A.UP_VOLUME) AS UP_VOLUME_SUM,
@@ -166,7 +166,7 @@ POSTHOOK: query: DROP MATERIALIZED VIEW source_table_001_mv_n0
 POSTHOOK: type: DROP_MATERIALIZED_VIEW
 POSTHOOK: Input: default@source_table_001_mv_n0
 POSTHOOK: Output: default@source_table_001_mv_n0
-PREHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv_n0 ENABLE REWRITE AS
+PREHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv_n0 AS
 SELECT
 SUM(A.DOWN_VOLUME) AS DOWN_VOLUME_SUM,
 SUM(A.UP_VOLUME) AS UP_VOLUME_SUM,
@@ -177,7 +177,7 @@ PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@source_table_001_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@source_table_001_mv_n0
-POSTHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv_n0 ENABLE REWRITE AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW source_table_001_mv_n0 AS
 SELECT
 SUM(A.DOWN_VOLUME) AS DOWN_VOLUME_SUM,
 SUM(A.UP_VOLUME) AS UP_VOLUME_SUM,

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out
index f293d49..ab28253 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out
@@ -578,7 +578,7 @@ POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@lineorder_n0
 POSTHOOK: Output: default@lineorder_n0
 #### A masked pattern was here ####
-PREHOOK: query: CREATE MATERIALIZED VIEW `ssb_mv_n0` ENABLE REWRITE
+PREHOOK: query: CREATE MATERIALIZED VIEW `ssb_mv_n0`
 AS
 SELECT
   c_city,
@@ -614,7 +614,7 @@ PREHOOK: Input: default@ssb_part_n0
 PREHOOK: Input: default@supplier_n0
 PREHOOK: Output: database:default
 PREHOOK: Output: default@ssb_mv_n0
-POSTHOOK: query: CREATE MATERIALIZED VIEW `ssb_mv_n0` ENABLE REWRITE
+POSTHOOK: query: CREATE MATERIALIZED VIEW `ssb_mv_n0`
 AS
 SELECT
   c_city,

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out
index 82a8ed5..994c9c1 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out
@@ -578,7 +578,7 @@ POSTHOOK: type: ANALYZE_TABLE
 POSTHOOK: Input: default@lineorder
 POSTHOOK: Output: default@lineorder
 #### A masked pattern was here ####
-PREHOOK: query: CREATE MATERIALIZED VIEW `ssb_mv` ENABLE REWRITE
+PREHOOK: query: CREATE MATERIALIZED VIEW `ssb_mv`
 AS
 SELECT
   cast(d_year || '-' || d_monthnuminyear || '-' || d_daynuminmonth as timestamp) as `__time`,
@@ -615,7 +615,7 @@ PREHOOK: Input: default@ssb_part
 PREHOOK: Input: default@supplier
 PREHOOK: Output: database:default
 PREHOOK: Output: default@ssb_mv
-POSTHOOK: query: CREATE MATERIALIZED VIEW `ssb_mv` ENABLE REWRITE
+POSTHOOK: query: CREATE MATERIALIZED VIEW `ssb_mv`
 AS
 SELECT
   cast(d_year || '-' || d_monthnuminyear || '-' || d_daynuminmonth as timestamp) as `__time`,

http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/materialized_view_authorization_sqlstd.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/materialized_view_authorization_sqlstd.q.out b/ql/src/test/results/clientpositive/materialized_view_authorization_sqlstd.q.out
index 578cf85..90f6fa4 100644
--- a/ql/src/test/results/clientpositive/materialized_view_authorization_sqlstd.q.out
+++ b/ql/src/test/results/clientpositive/materialized_view_authorization_sqlstd.q.out
@@ -17,12 +17,12 @@ POSTHOOK: Output: default@amvs_table
 POSTHOOK: Lineage: amvs_table.a SCRIPT []
 POSTHOOK: Lineage: amvs_table.b SCRIPT []
 POSTHOOK: Lineage: amvs_table.c SCRIPT []
-PREHOOK: query: create materialized view amvs_mat_view as select a, c from amvs_table
+PREHOOK: query: create materialized view amvs_mat_view disable rewrite as select a, c from amvs_table
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@amvs_table
 PREHOOK: Output: database:default
 PREHOOK: Output: default@amvs_mat_view
-POSTHOOK: query: create materialized view amvs_mat_view as select a, c from amvs_table
+POSTHOOK: query: create materialized view amvs_mat_view disable rewrite as select a, c from amvs_table
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@amvs_table
 POSTHOOK: Output: database:default
@@ -148,12 +148,12 @@ PREHOOK: Output: default@amvs_table
 POSTHOOK: query: grant select on table amvs_table to user user2 with grant option
 POSTHOOK: type: GRANT_PRIVILEGE
 POSTHOOK: Output: default@amvs_table
-PREHOOK: query: create materialized view amvs_mat_view2 as select a, b from amvs_table
+PREHOOK: query: create materialized view amvs_mat_view2 disable rewrite as select a, b from amvs_table
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
 PREHOOK: Input: default@amvs_table
 PREHOOK: Output: database:default
 PREHOOK: Output: default@amvs_mat_view2
-POSTHOOK: query: create materialized view amvs_mat_view2 as select a, b from amvs_table
+POSTHOOK: query: create materialized view amvs_mat_view2 disable rewrite as select a, b from amvs_table
 POSTHOOK: type: CREATE_MATERIALIZED_VIEW
 POSTHOOK: Input: default@amvs_table
 POSTHOOK: Output: database:default