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:36 UTC
[1/3] hive git commit: HIVE-18394: Materialized view: "Create
Materialized View" should default to rewritable ones (Jesus Camacho Rodriguez,
reviewed by Gopal V)
Repository: hive
Updated Branches:
refs/heads/master 780b0127f -> 6a24a0c5f
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/show_materialized_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_materialized_views.q.out b/ql/src/test/results/clientpositive/show_materialized_views.q.out
index 21d8721..715afea 100644
--- a/ql/src/test/results/clientpositive/show_materialized_views.q.out
+++ b/ql/src/test/results/clientpositive/show_materialized_views.q.out
@@ -26,37 +26,37 @@ STORED AS ORC TBLPROPERTIES ('transactional'='true')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:test1
POSTHOOK: Output: test1@shtb_test1
-PREHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view1 AS
+PREHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view1 DISABLE REWRITE AS
SELECT * FROM shtb_test1 where KEY > 1000 and KEY < 2000
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: test1@shtb_test1
PREHOOK: Output: database:test1
PREHOOK: Output: test1@shtb_test1_view1
-POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view1 AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view1 DISABLE REWRITE AS
SELECT * FROM shtb_test1 where KEY > 1000 and KEY < 2000
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: test1@shtb_test1
POSTHOOK: Output: database:test1
POSTHOOK: Output: test1@shtb_test1_view1
-PREHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view2 ENABLE REWRITE AS
+PREHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view2 AS
SELECT * FROM shtb_test1 where KEY > 100 and KEY < 200
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: test1@shtb_test1
PREHOOK: Output: database:test1
PREHOOK: Output: test1@shtb_test1_view2
-POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view2 ENABLE REWRITE AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view2 AS
SELECT * FROM shtb_test1 where KEY > 100 and KEY < 200
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: test1@shtb_test1
POSTHOOK: Output: database:test1
POSTHOOK: Output: test1@shtb_test1_view2
-PREHOOK: query: CREATE MATERIALIZED VIEW shtb_full_view2 ENABLE REWRITE AS
+PREHOOK: query: CREATE MATERIALIZED VIEW shtb_full_view2 AS
SELECT * FROM shtb_test1
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: test1@shtb_test1
PREHOOK: Output: database:test1
PREHOOK: Output: test1@shtb_full_view2
-POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_full_view2 ENABLE REWRITE AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_full_view2 AS
SELECT * FROM shtb_test1
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: test1@shtb_test1
@@ -88,25 +88,25 @@ STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:test2
POSTHOOK: Output: test2@shtb_test2
-PREHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view1 AS
+PREHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view1 DISABLE REWRITE AS
SELECT * FROM shtb_test1 where KEY > 1000 and KEY < 2000
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: test2@shtb_test1
PREHOOK: Output: database:test2
PREHOOK: Output: test2@shtb_test1_view1
-POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view1 AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_test1_view1 DISABLE REWRITE AS
SELECT * FROM shtb_test1 where KEY > 1000 and KEY < 2000
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: test2@shtb_test1
POSTHOOK: Output: database:test2
POSTHOOK: Output: test2@shtb_test1_view1
-PREHOOK: query: CREATE MATERIALIZED VIEW shtb_test2_view2 AS
+PREHOOK: query: CREATE MATERIALIZED VIEW shtb_test2_view2 DISABLE REWRITE AS
SELECT * FROM shtb_test2 where KEY > 100 and KEY < 200
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: test2@shtb_test2
PREHOOK: Output: database:test2
PREHOOK: Output: test2@shtb_test2_view2
-POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_test2_view2 AS
+POSTHOOK: query: CREATE MATERIALIZED VIEW shtb_test2_view2 DISABLE REWRITE AS
SELECT * FROM shtb_test2 where KEY > 100 and KEY < 200
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: test2@shtb_test2
[2/3] hive git commit: HIVE-18394: Materialized view: "Create
Materialized View" should default to rewritable ones (Jesus Camacho Rodriguez,
reviewed by Gopal V)
Posted by jc...@apache.org.
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
[3/3] hive git commit: HIVE-18394: Materialized view: "Create
Materialized View" should default to rewritable ones (Jesus Camacho Rodriguez,
reviewed by Gopal V)
Posted by jc...@apache.org.
HIVE-18394: Materialized view: "Create Materialized View" should default to rewritable ones (Jesus Camacho Rodriguez, reviewed by Gopal V)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6a24a0c5
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6a24a0c5
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6a24a0c5
Branch: refs/heads/master
Commit: 6a24a0c5f7ed065e3f9e169f533ee70668e123fd
Parents: 780b012
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Thu May 24 16:00:11 2018 -0700
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Mon May 28 20:23:50 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/hive/ql/parse/HiveParser.g | 4 +-
.../hadoop/hive/ql/parse/SemanticAnalyzer.java | 6 +--
.../clientnegative/drop_table_used_by_mv.q | 2 +-
...ialized_view_authorization_create_no_grant.q | 2 +-
...d_view_authorization_create_no_select_perm.q | 2 +-
...materialized_view_authorization_drop_other.q | 2 +-
...rialized_view_authorization_no_select_perm.q | 2 +-
...alized_view_authorization_rebuild_no_grant.q | 2 +-
...erialized_view_authorization_rebuild_other.q | 2 +-
.../clientnegative/materialized_view_delete.q | 2 +-
.../clientnegative/materialized_view_drop.q | 2 +-
.../clientnegative/materialized_view_drop2.q | 2 +-
.../clientnegative/materialized_view_insert.q | 2 +-
.../clientnegative/materialized_view_load.q | 2 +-
...materialized_view_no_transactional_rewrite.q | 2 +-
...terialized_view_no_transactional_rewrite_2.q | 2 +-
.../materialized_view_replace_with_view.q | 2 +-
.../clientnegative/materialized_view_update.q | 2 +-
.../test/queries/clientpositive/druidmini_mv.q | 4 +-
.../materialized_view_authorization_sqlstd.q | 4 +-
.../clientpositive/materialized_view_create.q | 10 ++--
.../materialized_view_create_rewrite.q | 4 +-
.../materialized_view_create_rewrite_2.q | 10 ++--
.../materialized_view_create_rewrite_3.q | 4 +-
.../materialized_view_create_rewrite_4.q | 4 +-
.../materialized_view_create_rewrite_5.q | 2 +-
.../materialized_view_create_rewrite_dummy.q | 4 +-
.../materialized_view_create_rewrite_multi_db.q | 4 +-
...rialized_view_create_rewrite_rebuild_dummy.q | 4 +-
...terialized_view_create_rewrite_time_window.q | 4 +-
.../clientpositive/materialized_view_describe.q | 8 +--
.../clientpositive/materialized_view_drop.q | 2 +-
.../materialized_view_rewrite_1.q | 20 ++++----
.../materialized_view_rewrite_2.q | 12 ++---
.../materialized_view_rewrite_3.q | 8 +--
.../materialized_view_rewrite_4.q | 14 +++---
.../materialized_view_rewrite_5.q | 26 +++++-----
.../materialized_view_rewrite_6.q | 10 ++--
.../materialized_view_rewrite_7.q | 6 +--
.../materialized_view_rewrite_8.q | 2 +-
.../materialized_view_rewrite_9.q | 4 +-
.../materialized_view_rewrite_ssb.q | 2 +-
.../materialized_view_rewrite_ssb_2.q | 2 +-
.../clientpositive/show_materialized_views.q | 10 ++--
.../clientnegative/drop_table_used_by_mv.q.out | 4 +-
...rialized_view_authorization_drop_other.q.out | 4 +-
...ized_view_authorization_no_select_perm.q.out | 4 +-
...ed_view_authorization_rebuild_no_grant.q.out | 4 +-
...lized_view_authorization_rebuild_other.q.out | 4 +-
.../materialized_view_delete.q.out | 4 +-
.../clientnegative/materialized_view_drop.q.out | 4 +-
.../materialized_view_drop2.q.out | 4 +-
.../materialized_view_insert.q.out | 4 +-
.../clientnegative/materialized_view_load.q.out | 4 +-
...alized_view_no_transactional_rewrite_2.q.out | 4 +-
.../materialized_view_replace_with_view.q.out | 4 +-
.../materialized_view_update.q.out | 4 +-
.../materialized_view_create_rewrite.q.out | 8 +--
.../clientpositive/druid/druidmini_mv.q.out | 8 +--
.../llap/materialized_view_create.q.out | 20 ++++----
.../llap/materialized_view_create_rewrite.q.out | 8 +--
.../materialized_view_create_rewrite_2.q.out | 20 ++++----
.../materialized_view_create_rewrite_3.q.out | 8 +--
.../materialized_view_create_rewrite_4.q.out | 8 +--
.../materialized_view_create_rewrite_5.q.out | 4 +-
...materialized_view_create_rewrite_dummy.q.out | 8 +--
...erialized_view_create_rewrite_multi_db.q.out | 8 +--
...ized_view_create_rewrite_rebuild_dummy.q.out | 8 +--
...alized_view_create_rewrite_time_window.q.out | 8 +--
.../llap/materialized_view_describe.q.out | 16 +++---
.../llap/materialized_view_drop.q.out | 4 +-
.../llap/materialized_view_rewrite_1.q.out | 40 +++++++--------
.../llap/materialized_view_rewrite_2.q.out | 24 ++++-----
.../llap/materialized_view_rewrite_3.q.out | 16 +++---
.../llap/materialized_view_rewrite_4.q.out | 28 +++++------
.../llap/materialized_view_rewrite_5.q.out | 52 ++++++++++----------
.../llap/materialized_view_rewrite_6.q.out | 20 ++++----
.../llap/materialized_view_rewrite_7.q.out | 12 ++---
.../llap/materialized_view_rewrite_8.q.out | 4 +-
.../llap/materialized_view_rewrite_9.q.out | 8 +--
.../llap/materialized_view_rewrite_ssb.q.out | 4 +-
.../llap/materialized_view_rewrite_ssb_2.q.out | 4 +-
...materialized_view_authorization_sqlstd.q.out | 8 +--
.../show_materialized_views.q.out | 20 ++++----
84 files changed, 327 insertions(+), 327 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
index 8726974..d4a0ed3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
@@ -1919,11 +1919,11 @@ createMaterializedViewStatement
}
@after { popMsg(state); }
: KW_CREATE KW_MATERIALIZED KW_VIEW (ifNotExists)? name=tableName
- rewriteEnabled? tableComment? tableRowFormat? tableFileFormat? tableLocation?
+ rewriteDisabled? tableComment? tableRowFormat? tableFileFormat? tableLocation?
tablePropertiesPrefixed? KW_AS selectStatementWithCTE
-> ^(TOK_CREATE_MATERIALIZED_VIEW $name
ifNotExists?
- rewriteEnabled?
+ rewriteDisabled?
tableComment?
tableRowFormat?
tableFileFormat?
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
index e23e403..863ab1b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
@@ -13253,7 +13253,7 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
String dbDotTable = getDotName(qualTabName);
List<FieldSchema> cols = null;
boolean ifNotExists = false;
- boolean rewriteEnabled = false;
+ boolean rewriteEnabled = true;
boolean orReplace = false;
boolean isAlterViewAs = false;
String comment = null;
@@ -13278,8 +13278,8 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
case HiveParser.TOK_IFNOTEXISTS:
ifNotExists = true;
break;
- case HiveParser.TOK_REWRITE_ENABLED:
- rewriteEnabled = true;
+ case HiveParser.TOK_REWRITE_DISABLED:
+ rewriteEnabled = false;
break;
case HiveParser.TOK_ORREPLACE:
orReplace = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/drop_table_used_by_mv.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/drop_table_used_by_mv.q b/ql/src/test/queries/clientnegative/drop_table_used_by_mv.q
index e5949a4..9724585 100644
--- a/ql/src/test/queries/clientnegative/drop_table_used_by_mv.q
+++ b/ql/src/test/queries/clientnegative/drop_table_used_by_mv.q
@@ -1,7 +1,7 @@
create table mytable (key int, value string);
insert into mytable values (1, 'val1'), (2, 'val2');
-create materialized view mv1 as
+create materialized view mv1 disable rewrite as
select key, value from mytable;
drop table mytable;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_grant.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_grant.q b/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_grant.q
index 079baff..6aa6385 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_grant.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_grant.q
@@ -12,4 +12,4 @@ grant select on table amvcng_gtable to user user2;
set user.name=user2;
-create materialized view amvcng_gmat_view as select a, c from amvcng_gtable;
+create materialized view amvcng_gmat_view disable rewrite as select a, c from amvcng_gtable;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_select_perm.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_select_perm.q b/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_select_perm.q
index 4de525c..2ec7133 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_select_perm.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_authorization_create_no_select_perm.q
@@ -11,4 +11,4 @@ insert into amvnsp_table values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonni
set user.name=user2;
-create materialized view amvnsp_mat_view as select a, c from amvnsp_table;
+create materialized view amvnsp_mat_view disable rewrite as select a, c from amvnsp_table;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_authorization_drop_other.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_authorization_drop_other.q b/ql/src/test/queries/clientnegative/materialized_view_authorization_drop_other.q
index c9a5930..9a486f2 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_authorization_drop_other.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_authorization_drop_other.q
@@ -8,7 +8,7 @@ create table amvdo_table (a int, b varchar(256), c decimal(10,2));
insert into amvdo_table values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view amvdo_mat_view as select a, c from amvdo_table;
+create materialized view amvdo_mat_view disable rewrite as select a, c from amvdo_table;
set user.name=user2;
drop materialized view amvdo_mat_view;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_authorization_no_select_perm.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_authorization_no_select_perm.q b/ql/src/test/queries/clientnegative/materialized_view_authorization_no_select_perm.q
index 8428152..eb59349 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_authorization_no_select_perm.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_authorization_no_select_perm.q
@@ -8,7 +8,7 @@ create table amvnsp_table (a int, b varchar(256), c decimal(10,2));
insert into amvnsp_table values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view amvnsp_mat_view as select a, c from amvnsp_table;
+create materialized view amvnsp_mat_view disable rewrite as select a, c from amvnsp_table;
set user.name=user2;
select * from amvnsp_mat_view;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_no_grant.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_no_grant.q b/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_no_grant.q
index 0ff50b0..fb849ab 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_no_grant.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_no_grant.q
@@ -11,7 +11,7 @@ insert into amvrng_table values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonni
grant select on table amvrng_table to user user2 with grant option;
set user.name=user2;
-create materialized view amvrng_mat_view as select a, c from amvrng_table;
+create materialized view amvrng_mat_view disable rewrite as select a, c from amvrng_table;
set user.name=user1;
alter materialized view amvrng_mat_view rebuild;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_other.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_other.q b/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_other.q
index 7c2d145..d22ee26 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_other.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_authorization_rebuild_other.q
@@ -8,7 +8,7 @@ create table amvro_table (a int, b varchar(256), c decimal(10,2));
insert into amvro_table values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view amvro_mat_view as select a, c from amvro_table;
+create materialized view amvro_mat_view disable rewrite as select a, c from amvro_table;
set user.name=user2;
alter materialized view amvro_mat_view rebuild;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_delete.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_delete.q b/ql/src/test/queries/clientnegative/materialized_view_delete.q
index f557df9..1aef7cd 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_delete.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_delete.q
@@ -5,6 +5,6 @@ set hive.enforce.bucketing=true;
create table dmv_basetable (a int, b varchar(256), c decimal(10,2));
-create materialized view dmv_mat_view as select a, b, c from dmv_basetable;
+create materialized view dmv_mat_view disable rewrite as select a, b, c from dmv_basetable;
delete from dmv_mat_view where b = 'fred';
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_drop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_drop.q b/ql/src/test/queries/clientnegative/materialized_view_drop.q
index f16d8a7..d47fb2e 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_drop.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_drop.q
@@ -2,7 +2,7 @@ create table cmv_basetable (a int, b varchar(256), c decimal(10,2));
insert into cmv_basetable values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view cmv_mat_view as select a, b, c from cmv_basetable;
+create materialized view cmv_mat_view disable rewrite as select a, b, c from cmv_basetable;
drop materialized view cmv_mat_view;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_drop2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_drop2.q b/ql/src/test/queries/clientnegative/materialized_view_drop2.q
index 627a78b..55c2a44 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_drop2.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_drop2.q
@@ -2,6 +2,6 @@ create table cmv_basetable (a int, b varchar(256), c decimal(10,2));
insert into cmv_basetable values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view cmv_mat_view as select a, b, c from cmv_basetable;
+create materialized view cmv_mat_view disable rewrite as select a, b, c from cmv_basetable;
drop view cmv_mat_view;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_insert.q b/ql/src/test/queries/clientnegative/materialized_view_insert.q
index 2daae52..4a2fe05 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_insert.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_insert.q
@@ -1,6 +1,6 @@
create table imv_basetable (a int, b varchar(256), c decimal(10,2));
-create materialized view imv_mat_view as select a, b, c from imv_basetable;
+create materialized view imv_mat_view disable rewrite as select a, b, c from imv_basetable;
insert into imv_mat_view values (1, 'fred', 3.14);
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_load.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_load.q b/ql/src/test/queries/clientnegative/materialized_view_load.q
index a8d0dfd..4a05bdc 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_load.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_load.q
@@ -1,7 +1,7 @@
create table lmv_basetable (a int, b varchar(256), c decimal(10,2));
-create materialized view lmv_mat_view as select a, b, c from lmv_basetable;
+create materialized view lmv_mat_view disable rewrite as select a, b, c from lmv_basetable;
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE lmv_mat_view;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite.q b/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite.q
index bfa0b8f..47c04e4 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite.q
@@ -7,4 +7,4 @@ create table cmv_basetable (a int, b varchar(256), c decimal(10,2));
insert into cmv_basetable values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view cmv_mat_view enable rewrite as select a, b, c from cmv_basetable;
+create materialized view cmv_mat_view as select a, b, c from cmv_basetable;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite_2.q b/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite_2.q
index 9432918..f89ee70 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite_2.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_no_transactional_rewrite_2.q
@@ -7,6 +7,6 @@ create table cmv_basetable (a int, b varchar(256), c decimal(10,2));
insert into cmv_basetable values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view cmv_mat_view as select a, b, c from cmv_basetable;
+create materialized view cmv_mat_view disable rewrite as select a, b, c from cmv_basetable;
alter materialized view cmv_mat_view enable rewrite;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_replace_with_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_replace_with_view.q b/ql/src/test/queries/clientnegative/materialized_view_replace_with_view.q
index 7c972f5..10474d1 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_replace_with_view.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_replace_with_view.q
@@ -2,7 +2,7 @@ create table rmvwv_basetable (a int, b varchar(256), c decimal(10,2));
insert into rmvwv_basetable values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view rmvwv_mat_view as select a, b, c from rmvwv_basetable;
+create materialized view rmvwv_mat_view disable rewrite as select a, b, c from rmvwv_basetable;
create or replace view rmvwv_mat_view as select a, c from rmvwv_basetable;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientnegative/materialized_view_update.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/materialized_view_update.q b/ql/src/test/queries/clientnegative/materialized_view_update.q
index 8245ef0..f295e75 100644
--- a/ql/src/test/queries/clientnegative/materialized_view_update.q
+++ b/ql/src/test/queries/clientnegative/materialized_view_update.q
@@ -5,6 +5,6 @@ set hive.enforce.bucketing=true;
create table umv_basetable (a int, b varchar(256), c decimal(10,2));
-create materialized view umv_mat_view as select a, b, c from umv_basetable;
+create materialized view umv_mat_view disable rewrite as select a, b, c from umv_basetable;
update umv_mat_view set b = 'joe' where b = 'fred';
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/druidmini_mv.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/druidmini_mv.q b/ql/src/test/queries/clientpositive/druidmini_mv.q
index 46b204e..dd8cf6a 100644
--- a/ql/src/test/queries/clientpositive/druidmini_mv.q
+++ b/ql/src/test/queries/clientpositive/druidmini_mv.q
@@ -25,7 +25,7 @@ FROM TABLE (
(3, 'charlie', 'charlie_a', 9.8, 1),
(3, 'charlie', 'charlie_b', 15.8, 1)) as q (a, b, userid, c, d);
-CREATE MATERIALIZED VIEW cmv_mat_view_n2 ENABLE REWRITE
+CREATE MATERIALIZED VIEW cmv_mat_view_n2
STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
TBLPROPERTIES ("druid.segment.granularity" = "HOUR")
AS
@@ -37,7 +37,7 @@ SELECT a, b, c FROM cmv_mat_view_n2;
SHOW TBLPROPERTIES cmv_mat_view_n2;
-CREATE MATERIALIZED VIEW IF NOT EXISTS cmv_mat_view2_n0 ENABLE REWRITE
+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/queries/clientpositive/materialized_view_authorization_sqlstd.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_authorization_sqlstd.q b/ql/src/test/queries/clientpositive/materialized_view_authorization_sqlstd.q
index 4742cc8..5807c77 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_authorization_sqlstd.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_authorization_sqlstd.q
@@ -9,7 +9,7 @@ create table amvs_table (a int, b varchar(256), c decimal(10,2));
insert into amvs_table values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view amvs_mat_view as select a, c from amvs_table;
+create materialized view amvs_mat_view disable rewrite as select a, c from amvs_table;
show grant user user1 on table amvs_mat_view;
@@ -47,7 +47,7 @@ select * from amvs_mat_view;
set user.name=user1;
grant select on table amvs_table to user user2 with grant option;
set user.name=user2;
-create materialized view amvs_mat_view2 as select a, b from amvs_table;
+create materialized view amvs_mat_view2 disable rewrite as select a, b from amvs_table;
select * from amvs_mat_view2;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_create.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create.q b/ql/src/test/queries/clientpositive/materialized_view_create.q
index bca3bd7..c65cde5 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create.q
@@ -3,23 +3,23 @@ create table cmv_basetable_n4 (a int, b varchar(256), c decimal(10,2));
insert into cmv_basetable_n4 values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view cmv_mat_view_n4 as select a, b, c from cmv_basetable_n4;
+create materialized view cmv_mat_view_n4 disable rewrite as select a, b, c from cmv_basetable_n4;
desc formatted cmv_mat_view_n4;
select * from cmv_mat_view_n4;
-create materialized view if not exists cmv_mat_view2_n1 as select a, c from cmv_basetable_n4;
+create materialized view if not exists cmv_mat_view2_n1 disable rewrite as select a, c from cmv_basetable_n4;
desc formatted cmv_mat_view2_n1;
select * from cmv_mat_view2_n1;
-create materialized view if not exists cmv_mat_view3 as select * from cmv_basetable_n4 where a > 1;
+create materialized view if not exists cmv_mat_view3 disable rewrite as select * from cmv_basetable_n4 where a > 1;
select * from cmv_mat_view3;
-create materialized view cmv_mat_view4 comment 'this is a comment' as select a, sum(c) from cmv_basetable_n4 group by a;
+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;
select * from cmv_mat_view4;
@@ -29,7 +29,7 @@ create table cmv_basetable2 (d int, e varchar(256), f decimal(10,2));
insert into cmv_basetable2 values (4, 'alfred', 100.30),(4, 'bob', 6133.14),(5, 'bonnie', 172.2),(6, 'calvin', 8.76),(17, 'charlie', 13144339.8);
-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);
+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);
select * from cmv_mat_view5;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q
index b67b888..9735e61 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q
@@ -17,14 +17,14 @@ insert into cmv_basetable_n10 values
analyze table cmv_basetable_n10 compute statistics for columns;
-create materialized view cmv_mat_view_n10 enable rewrite
+create materialized view cmv_mat_view_n10
as select a, b, c from cmv_basetable_n10 where a = 2;
select * from cmv_mat_view_n10;
show tblproperties cmv_mat_view_n10;
-create materialized view if not exists cmv_mat_view2_n4 enable rewrite
+create materialized view if not exists cmv_mat_view2_n4
as select a, c from cmv_basetable_n10 where a = 3;
select * from cmv_mat_view2_n4;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_2.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_2.q
index 21579d4..3f695d1 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_2.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_2.q
@@ -15,7 +15,7 @@ insert into cmv_basetable_n9 values
analyze table cmv_basetable_n9 compute statistics for columns;
-create materialized view cmv_mat_view_n9 enable rewrite
+create materialized view cmv_mat_view_n9
as select b from cmv_basetable_n9 where c > 10.0 group by a, b, c;
-- CANNOT BE TRIGGERED
@@ -24,7 +24,7 @@ select b from cmv_basetable_n9 where c > 20.0 group by a, b;
select b from cmv_basetable_n9 where c > 20.0 group by a, b;
-create materialized view cmv_mat_view_2 enable rewrite
+create materialized view cmv_mat_view_2
as select b, c from cmv_basetable_n9 where c > 10.0 group by a, b, c;
-- CANNOT BE TRIGGERED
@@ -33,7 +33,7 @@ select b from cmv_basetable_n9 where c > 20.0 group by a, b;
select b from cmv_basetable_n9 where c > 20.0 group by a, b;
-create materialized view cmv_mat_view_3 enable rewrite
+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;
-- CAN BE TRIGGERED
@@ -42,7 +42,7 @@ select b from cmv_basetable_n9 where c > 20.0 group by a, b;
select b from cmv_basetable_n9 where c > 20.0 group by a, b;
-create materialized view cmv_mat_view_4 enable rewrite
+create materialized view cmv_mat_view_4
as select a, b from cmv_basetable_n9 group by a, b;
-- CAN BE TRIGGERED
@@ -59,7 +59,7 @@ insert into cmv_basetable_2_n4 values
analyze table cmv_basetable_2_n4 compute statistics for columns;
-create materialized view cmv_mat_view_5 enable rewrite
+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/queries/clientpositive/materialized_view_create_rewrite_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_3.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_3.q
index 6f914ab..eb668a9 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_3.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_3.q
@@ -24,13 +24,13 @@ insert into cmv_basetable_2 values
analyze table cmv_basetable_2 compute statistics for columns;
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;
-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
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q
index ec0413f..f21db8a 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q
@@ -25,13 +25,13 @@ analyze table cmv_basetable_2_n2 compute statistics for columns;
-- CREATE VIEW WITH REWRITE DISABLED
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;
-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
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_5.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_5.q
index 141c92e..3026d90 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_5.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_5.q
@@ -23,7 +23,7 @@ insert into cmv_basetable_2_n3 values
analyze table cmv_basetable_2_n3 compute statistics for columns;
-CREATE MATERIALIZED VIEW cmv_mat_view_n6 ENABLE REWRITE
+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/queries/clientpositive/materialized_view_create_rewrite_dummy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_dummy.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_dummy.q
index be72d3b..8c9da8a 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_dummy.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_dummy.q
@@ -18,14 +18,14 @@ insert into cmv_basetable_n0 values
analyze table cmv_basetable_n0 compute statistics for columns;
-create materialized view cmv_mat_view_n0 enable rewrite
+create materialized view cmv_mat_view_n0
as select a, b, c from cmv_basetable_n0 where a = 2;
select * from cmv_mat_view_n0;
show tblproperties cmv_mat_view_n0;
-create materialized view if not exists cmv_mat_view2 enable rewrite
+create materialized view if not exists cmv_mat_view2
as select a, c from cmv_basetable_n0 where a = 3;
select * from cmv_mat_view2;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q
index 5934174..85d926f 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q
@@ -22,14 +22,14 @@ analyze table cmv_basetable_n7 compute statistics for columns;
create database db2;
use db2;
-create materialized view cmv_mat_view_n7 enable rewrite
+create materialized view cmv_mat_view_n7
as select a, b, c from db1.cmv_basetable_n7 where a = 2;
select * from cmv_mat_view_n7;
show tblproperties cmv_mat_view_n7;
-create materialized view if not exists cmv_mat_view2_n2 enable rewrite
+create materialized view if not exists cmv_mat_view2_n2
as select a, c from db1.cmv_basetable_n7 where a = 3;
select * from cmv_mat_view2_n2;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_rebuild_dummy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_rebuild_dummy.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_rebuild_dummy.q
index 1c1a45f..be1f13d 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_rebuild_dummy.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_rebuild_dummy.q
@@ -25,13 +25,13 @@ insert into cmv_basetable_2_n0 values
analyze table cmv_basetable_2_n0 compute statistics for columns;
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;
-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
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q
index 492264c..c61730e 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q
@@ -25,13 +25,13 @@ analyze table cmv_basetable_2_n1 compute statistics for columns;
-- CREATE VIEW WITH REWRITE DISABLED
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;
-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
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_describe.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_describe.q b/ql/src/test/queries/clientpositive/materialized_view_describe.q
index d137861..b2d84bc 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_describe.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_describe.q
@@ -3,7 +3,7 @@ create table cmv_basetable_n8 (a int, b varchar(256), c decimal(10,2));
insert into cmv_basetable_n8 values (1, 'alfred', 10.30),(2, 'bob', 3.14),(2, 'bonnie', 172342.2),(3, 'calvin', 978.76),(3, 'charlie', 9.8);
-create materialized view cmv_mat_view_n8
+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;
@@ -19,7 +19,7 @@ select a, c from cmv_mat_view_n8;
drop materialized view cmv_mat_view_n8;
-create materialized view cmv_mat_view2_n3
+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;
@@ -30,7 +30,7 @@ select a from cmv_mat_view2_n3;
drop materialized view cmv_mat_view2_n3;
-create materialized view cmv_mat_view3_n0
+create materialized view cmv_mat_view3_n0 disable rewrite
comment 'this is the third view'
row format
delimited fields terminated by '\t'
@@ -46,7 +46,7 @@ drop materialized view cmv_mat_view3_n0;
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/t;
-create materialized view cmv_mat_view4_n0
+create materialized view cmv_mat_view4_n0 disable rewrite
comment 'this is the last view'
stored as textfile
location '${system:test.tmp.dir}/t'
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_drop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_drop.q b/ql/src/test/queries/clientpositive/materialized_view_drop.q
index da1b616..0a5233a 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_drop.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_drop.q
@@ -1,7 +1,7 @@
--! qt:dataset:alltypesorc
set hive.vectorized.execution.enabled=false;
-create materialized view dmv_mat_view as select cint, cstring1 from alltypesorc where cint < 0;
+create materialized view dmv_mat_view disable rewrite as select cint, cstring1 from alltypesorc where cint < 0;
show table extended like dmv_mat_view;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_rewrite_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_1.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_1.q
index e2e4384..cc6b5cd 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_1.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_1.q
@@ -49,7 +49,7 @@ alter table emps_n3 add constraint fk1 foreign key (deptno) references depts_n2(
alter table depts_n2 add constraint fk2 foreign key (locationid) references locations_n2(locationid) disable novalidate rely;
-- EXAMPLE 1
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select * from emps_n3 where empid < 150;
analyze table mv1_n2 compute statistics for columns;
@@ -65,7 +65,7 @@ join depts_n2 using (deptno);
drop materialized view mv1_n2;
-- EXAMPLE 2
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select deptno, name, salary, commission
from emps_n3;
analyze table mv1_n2 compute statistics for columns;
@@ -82,7 +82,7 @@ join depts_n2 using (deptno);
drop materialized view mv1_n2;
-- EXAMPLE 3
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select empid deptno from emps_n3
join depts_n2 using (deptno);
analyze table mv1_n2 compute statistics for columns;
@@ -97,7 +97,7 @@ join depts_n2 using (deptno) where empid = 1;
drop materialized view mv1_n2;
-- EXAMPLE 4
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select * from emps_n3 where empid < 200;
analyze table mv1_n2 compute statistics for columns;
@@ -111,7 +111,7 @@ union all select * from emps_n3 where empid < 150;
drop materialized view mv1_n2;
-- EXAMPLE 5 - NO MV, ALREADY UNIQUE
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select empid, deptno from emps_n3 group by empid, deptno;
analyze table mv1_n2 compute statistics for columns;
@@ -123,7 +123,7 @@ select empid, deptno from emps_n3 group by empid, deptno;
drop materialized view mv1_n2;
-- EXAMPLE 5 - NO MV, ALREADY UNIQUE
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select empid, name from emps_n3 group by empid, name;
analyze table mv1_n2 compute statistics for columns;
@@ -135,7 +135,7 @@ select empid, name from emps_n3 group by empid, name;
drop materialized view mv1_n2;
-- EXAMPLE 5
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select name, salary from emps_n3 group by name, salary;
analyze table mv1_n2 compute statistics for columns;
@@ -147,7 +147,7 @@ select name, salary from emps_n3 group by name, salary;
drop materialized view mv1_n2;
-- EXAMPLE 6
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select name, salary from emps_n3 group by name, salary;
analyze table mv1_n2 compute statistics for columns;
@@ -159,7 +159,7 @@ select name from emps_n3 group by name;
drop materialized view mv1_n2;
-- EXAMPLE 7
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select name, salary from emps_n3 where deptno = 10 group by name, salary;
analyze table mv1_n2 compute statistics for columns;
@@ -171,7 +171,7 @@ select name from emps_n3 where deptno = 10 group by name;
drop materialized view mv1_n2;
-- EXAMPLE 9
-create materialized view mv1_n2 enable rewrite as
+create materialized view mv1_n2 as
select name, salary, count(*) as c, sum(empid) as s
from emps_n3 group by name, salary;
analyze table mv1_n2 compute statistics for columns;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_rewrite_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_2.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_2.q
index a49726c..67ef84a 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_2.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_2.q
@@ -49,7 +49,7 @@ alter table emps_n0 add constraint fk1 foreign key (deptno) references depts_n0(
alter table depts_n0 add constraint fk2 foreign key (locationid) references locations_n0(locationid) disable novalidate rely;
-- EXAMPLE 16
-create materialized view mv1_n0 enable rewrite as
+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;
@@ -67,7 +67,7 @@ group by empid, depts_n0.deptno;
drop materialized view mv1_n0;
-- EXAMPLE 17
-create materialized view mv1_n0 enable rewrite as
+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;
@@ -85,7 +85,7 @@ group by empid, depts_n0.deptno;
drop materialized view mv1_n0;
-- EXAMPLE 18
-create materialized view mv1_n0 enable rewrite as
+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;
@@ -103,7 +103,7 @@ group by empid, depts_n0.deptno;
drop materialized view mv1_n0;
-- EXAMPLE 19
-create materialized view mv1_n0 enable rewrite as
+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;
@@ -121,7 +121,7 @@ group by depts_n0.deptno, emps_n0.empid;
drop materialized view mv1_n0;
-- EXAMPLE 20
-create materialized view mv1_n0 enable rewrite as
+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;
@@ -139,7 +139,7 @@ group by depts_n0.deptno;
drop materialized view mv1_n0;
-- EXAMPLE 23
-create materialized view mv1_n0 enable rewrite as
+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/queries/clientpositive/materialized_view_rewrite_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_3.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_3.q
index fe00860..106fd93 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_3.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_3.q
@@ -49,7 +49,7 @@ alter table emps_n9 add constraint fk1 foreign key (deptno) references depts_n7(
alter table depts_n7 add constraint fk2 foreign key (locationid) references locations_n5(locationid) disable novalidate rely;
-- EXAMPLE 34
-create materialized view mv1_n5 enable rewrite as
+create materialized view mv1_n5 as
select empid deptno from emps_n9
join depts_n7 using (deptno);
analyze table mv1_n5 compute statistics for columns;
@@ -64,7 +64,7 @@ join depts_n7 using (deptno) where empid = 1;
drop materialized view mv1_n5;
-- EXAMPLE 35
-create materialized view mv1_n5 enable rewrite as
+create materialized view mv1_n5 as
select cast(empid as BIGINT) from emps_n9
join depts_n7 using (deptno);
analyze table mv1_n5 compute statistics for columns;
@@ -79,7 +79,7 @@ join depts_n7 using (deptno) where empid > 1;
drop materialized view mv1_n5;
-- EXAMPLE 36
-create materialized view mv1_n5 enable rewrite as
+create materialized view mv1_n5 as
select cast(empid as BIGINT) from emps_n9
join depts_n7 using (deptno);
analyze table mv1_n5 compute statistics for columns;
@@ -94,7 +94,7 @@ join depts_n7 using (deptno) where empid = 1;
drop materialized view mv1_n5;
-- EXAMPLE 38
-create materialized view mv1_n5 enable rewrite as
+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/queries/clientpositive/materialized_view_rewrite_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_4.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_4.q
index 4b097cd..b5fd2ca 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_4.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_4.q
@@ -50,7 +50,7 @@ alter table depts_n4 add constraint fk2 foreign key (locationid) references loca
-- EXAMPLE 10
-create materialized view mv1_n3 enable rewrite as
+create materialized view mv1_n3 as
select name, salary, count(*) as c, sum(empid) as s
from emps_n5 group by name, salary;
analyze table mv1_n3 compute statistics for columns;
@@ -65,7 +65,7 @@ from emps_n5 group by name;
drop materialized view mv1_n3;
-- EXAMPLE 11
-create materialized view mv1_n3 enable rewrite as
+create materialized view mv1_n3 as
select name, salary, count(*) as c, sum(empid) as s
from emps_n5 group by name, salary;
analyze table mv1_n3 compute statistics for columns;
@@ -80,7 +80,7 @@ from emps_n5 group by name, salary;
drop materialized view mv1_n3;
-- EXAMPLE 25
-create materialized view mv1_n3 enable rewrite as
+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;
@@ -98,7 +98,7 @@ group by depts_n4.deptno;
drop materialized view mv1_n3;
-- EXAMPLE 27
-create materialized view mv1_n3 enable rewrite as
+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;
@@ -116,7 +116,7 @@ where emps_n5.deptno > 10 group by depts_n4.deptno;
drop materialized view mv1_n3;
-- EXAMPLE 28
-create materialized view mv1_n3 enable rewrite as
+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;
@@ -134,7 +134,7 @@ where depts_n4.deptno > 10 group by depts_n4.deptno;
drop materialized view mv1_n3;
-- EXAMPLE 29
-create materialized view mv1_n3 enable rewrite as
+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)
@@ -157,7 +157,7 @@ group by dependents_n3.empid;
drop materialized view mv1_n3;
-- EXAMPLE 32
-create materialized view mv1_n3 enable rewrite as
+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/queries/clientpositive/materialized_view_rewrite_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_5.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_5.q
index 2964c83..d0e4244 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_5.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_5.q
@@ -53,7 +53,7 @@ alter table depts_n1 change column locationid locationid int constraint nn2 not
-- EXAMPLE 8
-create materialized view mv1_n1 enable rewrite as
+create materialized view mv1_n1 as
select name, deptno, salary from emps_n2 where deptno > 15 group by name, deptno, salary;
analyze table mv1_n1 compute statistics for columns;
@@ -65,7 +65,7 @@ select name from emps_n2 where deptno >= 20 group by name;
drop materialized view mv1_n1;
-- EXAMPLE 12
-create materialized view mv1_n1 enable rewrite as
+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;
analyze table mv1_n1 compute statistics for columns;
@@ -80,7 +80,7 @@ from emps_n2 where deptno > 15 group by name;
drop materialized view mv1_n1;
-- EXAMPLE 22
-create materialized view mv1_n1 enable rewrite as
+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)
@@ -110,7 +110,7 @@ group by dependents_n1.empid;
drop materialized view mv1_n1;
-- EXAMPLE 24
-create materialized view mv1_n1 enable rewrite as
+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;
@@ -124,7 +124,7 @@ select deptno from emps_n2 group by deptno;
drop materialized view mv1_n1;
-- EXAMPLE 26
-create materialized view mv1_n1 enable rewrite as
+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;
@@ -140,7 +140,7 @@ from emps_n2 group by empid, deptno;
drop materialized view mv1_n1;
-- EXAMPLE 30
-create materialized view mv1_n1 enable rewrite as
+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)
@@ -163,7 +163,7 @@ group by dependents_n1.empid;
drop materialized view mv1_n1;
-- EXAMPLE 31
-create materialized view mv1_n1 enable rewrite as
+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)
@@ -186,7 +186,7 @@ group by depts_n1.name;
drop materialized view mv1_n1;
-- EXAMPLE 41
-create materialized view mv1_n1 enable rewrite as
+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)
@@ -205,7 +205,7 @@ join dependents_n1 on (a.empid = dependents_n1.empid);
drop materialized view mv1_n1;
-- EXAMPLE 42
-create materialized view mv1_n1 enable rewrite as
+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)
@@ -224,7 +224,7 @@ join dependents_n1 on (a.empid = dependents_n1.empid);
drop materialized view mv1_n1;
-- EXAMPLE 43
-create materialized view mv1_n1 enable rewrite as
+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);
@@ -238,7 +238,7 @@ select empid from emps_n2 where empid = 1;
drop materialized view mv1_n1;
-- EXAMPLE 44
-create materialized view mv1_n1 enable rewrite as
+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)
@@ -257,7 +257,7 @@ where emps_n2.empid = 1;
drop materialized view mv1_n1;
-- EXAMPLE 45a
-create materialized view mv1_n1 enable rewrite as
+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)
@@ -277,7 +277,7 @@ where emps_n2.empid = 1;
drop materialized view mv1_n1;
-- EXAMPLE 45b
-create materialized view mv1_n1 enable rewrite as
+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/queries/clientpositive/materialized_view_rewrite_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_6.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_6.q
index ca31506..74acda5 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_6.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_6.q
@@ -53,7 +53,7 @@ alter table depts change column locationid locationid int constraint nn2 not nul
-- EXAMPLE 13
-create materialized view mv1 enable rewrite as
+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;
analyze table mv1 compute statistics for columns;
@@ -68,7 +68,7 @@ from emps where deptno > 10 group by salary;
drop materialized view mv1;
-- EXAMPLE 14
-create materialized view mv1 enable rewrite as
+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;
analyze table mv1 compute statistics for columns;
@@ -83,7 +83,7 @@ from emps where deptno > 15 group by salary;
drop materialized view mv1;
-- EXAMPLE 37
-create materialized view mv1 enable rewrite as
+create materialized view mv1 as
select depts.name
from emps
join depts on (emps.deptno = depts.deptno);
@@ -103,7 +103,7 @@ join dependents on (depts.name = dependents.name);
drop materialized view mv1;
-- EXAMPLE 39
-create materialized view mv1 enable rewrite as
+create materialized view mv1 as
select depts.name
from emps
join depts on (emps.deptno = depts.deptno);
@@ -125,7 +125,7 @@ join emps on (emps.deptno = depts.deptno);
drop materialized view mv1;
-- EXAMPLE 46
-create materialized view mv1 enable rewrite as
+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);
analyze table mv1 compute statistics for columns;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_rewrite_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_7.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_7.q
index 7d2eb48..a6a4ee8 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_7.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_7.q
@@ -53,7 +53,7 @@ alter table depts_n6 change column locationid locationid int constraint nn2 not
-- EXAMPLE 21 -- WORKS NOW
-create materialized view mv1_n4 enable rewrite as
+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)
@@ -83,7 +83,7 @@ group by dependents_n4.empid, depts_n6.deptno;
drop materialized view mv1_n4;
-- EXAMPLE 33
-create materialized view mv1_n4 enable rewrite as
+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)
@@ -114,7 +114,7 @@ drop materialized view mv1_n4;
-- EXAMPLE 40 -- REWRITING HAPPENS BUT DISCARDED
-- DUE TO COST EXCEPT WITH HEURISTICS
-create materialized view mv1_n4 enable rewrite as
+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/queries/clientpositive/materialized_view_rewrite_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_8.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_8.q
index 9315979..dc01a66 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_8.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_8.q
@@ -21,7 +21,7 @@ insert into table source_table_001
values ('2010-10-10', 1, 1, 'env', 1, 1);
analyze table source_table_001 compute statistics for columns;
-CREATE MATERIALIZED VIEW source_table_001_mv ENABLE REWRITE AS
+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/queries/clientpositive/materialized_view_rewrite_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_9.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_9.q
index 97700b0..25d0fdb 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_9.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_9.q
@@ -21,7 +21,7 @@ insert into table source_table_001_n0
values ('2010-10-10 00:00:00', 1, 1, 'env', 1, 1);
analyze table source_table_001_n0 compute statistics for columns;
-CREATE MATERIALIZED VIEW source_table_001_mv_n0 ENABLE REWRITE AS
+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,
@@ -39,7 +39,7 @@ group by A.MY_ID,A.MY_ID2,A.ENVIRONMENT,FLOOR(A.MY_DATE to hour);
DROP MATERIALIZED VIEW source_table_001_mv_n0;
-CREATE MATERIALIZED VIEW source_table_001_mv_n0 ENABLE REWRITE AS
+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/queries/clientpositive/materialized_view_rewrite_ssb.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb.q
index 880f4f5..2674738 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb.q
@@ -209,7 +209,7 @@ analyze table ssb_part_n0 compute statistics for columns;
analyze table supplier_n0 compute statistics for columns;
analyze table lineorder_n0 compute statistics for columns;
-CREATE MATERIALIZED VIEW `ssb_mv_n0` ENABLE REWRITE
+CREATE MATERIALIZED VIEW `ssb_mv_n0`
AS
SELECT
c_city,
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q
index 6a92d9a..c8aa857 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q
@@ -209,7 +209,7 @@ analyze table ssb_part compute statistics for columns;
analyze table supplier compute statistics for columns;
analyze table lineorder compute statistics for columns;
-CREATE MATERIALIZED VIEW `ssb_mv` ENABLE REWRITE
+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/queries/clientpositive/show_materialized_views.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/show_materialized_views.q b/ql/src/test/queries/clientpositive/show_materialized_views.q
index 50d0315..f8d49d6 100644
--- a/ql/src/test/queries/clientpositive/show_materialized_views.q
+++ b/ql/src/test/queries/clientpositive/show_materialized_views.q
@@ -9,11 +9,11 @@ CREATE DATABASE test2;
USE test1;
CREATE TABLE shtb_test1(KEY INT, VALUE STRING) PARTITIONED BY(ds STRING)
STORED AS ORC TBLPROPERTIES ('transactional'='true');
-CREATE MATERIALIZED VIEW shtb_test1_view1 AS
+CREATE MATERIALIZED VIEW shtb_test1_view1 DISABLE REWRITE AS
SELECT * FROM shtb_test1 where KEY > 1000 and KEY < 2000;
-CREATE MATERIALIZED VIEW shtb_test1_view2 ENABLE REWRITE AS
+CREATE MATERIALIZED VIEW shtb_test1_view2 AS
SELECT * FROM shtb_test1 where KEY > 100 and KEY < 200;
-CREATE MATERIALIZED VIEW shtb_full_view2 ENABLE REWRITE AS
+CREATE MATERIALIZED VIEW shtb_full_view2 AS
SELECT * FROM shtb_test1;
USE test2;
@@ -21,9 +21,9 @@ CREATE TABLE shtb_test1(KEY INT, VALUE STRING) PARTITIONED BY(ds STRING)
STORED AS TEXTFILE;
CREATE TABLE shtb_test2(KEY INT, VALUE STRING) PARTITIONED BY(ds STRING)
STORED AS TEXTFILE;
-CREATE MATERIALIZED VIEW shtb_test1_view1 AS
+CREATE MATERIALIZED VIEW shtb_test1_view1 DISABLE REWRITE AS
SELECT * FROM shtb_test1 where KEY > 1000 and KEY < 2000;
-CREATE MATERIALIZED VIEW shtb_test2_view2 AS
+CREATE MATERIALIZED VIEW shtb_test2_view2 DISABLE REWRITE AS
SELECT * FROM shtb_test2 where KEY > 100 and KEY < 200;
USE test1;
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/drop_table_used_by_mv.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/drop_table_used_by_mv.q.out b/ql/src/test/results/clientnegative/drop_table_used_by_mv.q.out
index 5a9cabe..635f31d 100644
--- a/ql/src/test/results/clientnegative/drop_table_used_by_mv.q.out
+++ b/ql/src/test/results/clientnegative/drop_table_used_by_mv.q.out
@@ -16,13 +16,13 @@ POSTHOOK: Input: _dummy_database@_dummy_table
POSTHOOK: Output: default@mytable
POSTHOOK: Lineage: mytable.key SCRIPT []
POSTHOOK: Lineage: mytable.value SCRIPT []
-PREHOOK: query: create materialized view mv1 as
+PREHOOK: query: create materialized view mv1 disable rewrite as
select key, value from mytable
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@mytable
PREHOOK: Output: database:default
PREHOOK: Output: default@mv1
-POSTHOOK: query: create materialized view mv1 as
+POSTHOOK: query: create materialized view mv1 disable rewrite as
select key, value from mytable
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@mytable
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_authorization_drop_other.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_authorization_drop_other.q.out b/ql/src/test/results/clientnegative/materialized_view_authorization_drop_other.q.out
index fcd84d3..d95691a 100644
--- a/ql/src/test/results/clientnegative/materialized_view_authorization_drop_other.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_authorization_drop_other.q.out
@@ -17,12 +17,12 @@ POSTHOOK: Output: default@amvdo_table
POSTHOOK: Lineage: amvdo_table.a SCRIPT []
POSTHOOK: Lineage: amvdo_table.b SCRIPT []
POSTHOOK: Lineage: amvdo_table.c SCRIPT []
-PREHOOK: query: create materialized view amvdo_mat_view as select a, c from amvdo_table
+PREHOOK: query: create materialized view amvdo_mat_view disable rewrite as select a, c from amvdo_table
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@amvdo_table
PREHOOK: Output: database:default
PREHOOK: Output: default@amvdo_mat_view
-POSTHOOK: query: create materialized view amvdo_mat_view as select a, c from amvdo_table
+POSTHOOK: query: create materialized view amvdo_mat_view disable rewrite as select a, c from amvdo_table
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@amvdo_table
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_authorization_no_select_perm.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_authorization_no_select_perm.q.out b/ql/src/test/results/clientnegative/materialized_view_authorization_no_select_perm.q.out
index 33d1aa0..d647b01 100644
--- a/ql/src/test/results/clientnegative/materialized_view_authorization_no_select_perm.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_authorization_no_select_perm.q.out
@@ -17,12 +17,12 @@ POSTHOOK: Output: default@amvnsp_table
POSTHOOK: Lineage: amvnsp_table.a SCRIPT []
POSTHOOK: Lineage: amvnsp_table.b SCRIPT []
POSTHOOK: Lineage: amvnsp_table.c SCRIPT []
-PREHOOK: query: create materialized view amvnsp_mat_view as select a, c from amvnsp_table
+PREHOOK: query: create materialized view amvnsp_mat_view disable rewrite as select a, c from amvnsp_table
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@amvnsp_table
PREHOOK: Output: database:default
PREHOOK: Output: default@amvnsp_mat_view
-POSTHOOK: query: create materialized view amvnsp_mat_view as select a, c from amvnsp_table
+POSTHOOK: query: create materialized view amvnsp_mat_view disable rewrite as select a, c from amvnsp_table
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@amvnsp_table
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_no_grant.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_no_grant.q.out b/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_no_grant.q.out
index f8dd4a9..df63b7e 100644
--- a/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_no_grant.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_no_grant.q.out
@@ -23,12 +23,12 @@ PREHOOK: Output: default@amvrng_table
POSTHOOK: query: grant select on table amvrng_table to user user2 with grant option
POSTHOOK: type: GRANT_PRIVILEGE
POSTHOOK: Output: default@amvrng_table
-PREHOOK: query: create materialized view amvrng_mat_view as select a, c from amvrng_table
+PREHOOK: query: create materialized view amvrng_mat_view disable rewrite as select a, c from amvrng_table
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@amvrng_table
PREHOOK: Output: database:default
PREHOOK: Output: default@amvrng_mat_view
-POSTHOOK: query: create materialized view amvrng_mat_view as select a, c from amvrng_table
+POSTHOOK: query: create materialized view amvrng_mat_view disable rewrite as select a, c from amvrng_table
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@amvrng_table
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_other.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_other.q.out b/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_other.q.out
index 0bde682..0aa5f65 100644
--- a/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_other.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_authorization_rebuild_other.q.out
@@ -17,12 +17,12 @@ POSTHOOK: Output: default@amvro_table
POSTHOOK: Lineage: amvro_table.a SCRIPT []
POSTHOOK: Lineage: amvro_table.b SCRIPT []
POSTHOOK: Lineage: amvro_table.c SCRIPT []
-PREHOOK: query: create materialized view amvro_mat_view as select a, c from amvro_table
+PREHOOK: query: create materialized view amvro_mat_view disable rewrite as select a, c from amvro_table
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@amvro_table
PREHOOK: Output: database:default
PREHOOK: Output: default@amvro_mat_view
-POSTHOOK: query: create materialized view amvro_mat_view as select a, c from amvro_table
+POSTHOOK: query: create materialized view amvro_mat_view disable rewrite as select a, c from amvro_table
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@amvro_table
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_delete.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_delete.q.out b/ql/src/test/results/clientnegative/materialized_view_delete.q.out
index c4a5887..2196615 100644
--- a/ql/src/test/results/clientnegative/materialized_view_delete.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_delete.q.out
@@ -6,12 +6,12 @@ POSTHOOK: query: create table dmv_basetable (a int, b varchar(256), c decimal(10
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@dmv_basetable
-PREHOOK: query: create materialized view dmv_mat_view as select a, b, c from dmv_basetable
+PREHOOK: query: create materialized view dmv_mat_view disable rewrite as select a, b, c from dmv_basetable
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@dmv_basetable
PREHOOK: Output: database:default
PREHOOK: Output: default@dmv_mat_view
-POSTHOOK: query: create materialized view dmv_mat_view as select a, b, c from dmv_basetable
+POSTHOOK: query: create materialized view dmv_mat_view disable rewrite as select a, b, c from dmv_basetable
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@dmv_basetable
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_drop.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_drop.q.out b/ql/src/test/results/clientnegative/materialized_view_drop.q.out
index 4714597..da95afb 100644
--- a/ql/src/test/results/clientnegative/materialized_view_drop.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_drop.q.out
@@ -17,12 +17,12 @@ POSTHOOK: Output: default@cmv_basetable
POSTHOOK: Lineage: cmv_basetable.a SCRIPT []
POSTHOOK: Lineage: cmv_basetable.b SCRIPT []
POSTHOOK: Lineage: cmv_basetable.c SCRIPT []
-PREHOOK: query: create materialized view cmv_mat_view as select a, b, c from cmv_basetable
+PREHOOK: query: create materialized view cmv_mat_view disable rewrite as select a, b, c from cmv_basetable
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@cmv_basetable
PREHOOK: Output: database:default
PREHOOK: Output: default@cmv_mat_view
-POSTHOOK: query: create materialized view cmv_mat_view as select a, b, c from cmv_basetable
+POSTHOOK: query: create materialized view cmv_mat_view disable rewrite as select a, b, c from cmv_basetable
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@cmv_basetable
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_drop2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_drop2.q.out b/ql/src/test/results/clientnegative/materialized_view_drop2.q.out
index 6dfdfa9..d4f243c 100644
--- a/ql/src/test/results/clientnegative/materialized_view_drop2.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_drop2.q.out
@@ -17,12 +17,12 @@ POSTHOOK: Output: default@cmv_basetable
POSTHOOK: Lineage: cmv_basetable.a SCRIPT []
POSTHOOK: Lineage: cmv_basetable.b SCRIPT []
POSTHOOK: Lineage: cmv_basetable.c SCRIPT []
-PREHOOK: query: create materialized view cmv_mat_view as select a, b, c from cmv_basetable
+PREHOOK: query: create materialized view cmv_mat_view disable rewrite as select a, b, c from cmv_basetable
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@cmv_basetable
PREHOOK: Output: database:default
PREHOOK: Output: default@cmv_mat_view
-POSTHOOK: query: create materialized view cmv_mat_view as select a, b, c from cmv_basetable
+POSTHOOK: query: create materialized view cmv_mat_view disable rewrite as select a, b, c from cmv_basetable
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@cmv_basetable
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_insert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_insert.q.out b/ql/src/test/results/clientnegative/materialized_view_insert.q.out
index 3e1f591..734cbb2 100644
--- a/ql/src/test/results/clientnegative/materialized_view_insert.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_insert.q.out
@@ -6,12 +6,12 @@ POSTHOOK: query: create table imv_basetable (a int, b varchar(256), c decimal(10
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@imv_basetable
-PREHOOK: query: create materialized view imv_mat_view as select a, b, c from imv_basetable
+PREHOOK: query: create materialized view imv_mat_view disable rewrite as select a, b, c from imv_basetable
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@imv_basetable
PREHOOK: Output: database:default
PREHOOK: Output: default@imv_mat_view
-POSTHOOK: query: create materialized view imv_mat_view as select a, b, c from imv_basetable
+POSTHOOK: query: create materialized view imv_mat_view disable rewrite as select a, b, c from imv_basetable
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@imv_basetable
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_load.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_load.q.out b/ql/src/test/results/clientnegative/materialized_view_load.q.out
index b48bba4..29bcfb4 100644
--- a/ql/src/test/results/clientnegative/materialized_view_load.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_load.q.out
@@ -6,12 +6,12 @@ POSTHOOK: query: create table lmv_basetable (a int, b varchar(256), c decimal(10
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@lmv_basetable
-PREHOOK: query: create materialized view lmv_mat_view as select a, b, c from lmv_basetable
+PREHOOK: query: create materialized view lmv_mat_view disable rewrite as select a, b, c from lmv_basetable
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@lmv_basetable
PREHOOK: Output: database:default
PREHOOK: Output: default@lmv_mat_view
-POSTHOOK: query: create materialized view lmv_mat_view as select a, b, c from lmv_basetable
+POSTHOOK: query: create materialized view lmv_mat_view disable rewrite as select a, b, c from lmv_basetable
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@lmv_basetable
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_no_transactional_rewrite_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_no_transactional_rewrite_2.q.out b/ql/src/test/results/clientnegative/materialized_view_no_transactional_rewrite_2.q.out
index 481207f..45fb208 100644
--- a/ql/src/test/results/clientnegative/materialized_view_no_transactional_rewrite_2.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_no_transactional_rewrite_2.q.out
@@ -17,12 +17,12 @@ POSTHOOK: Output: default@cmv_basetable
POSTHOOK: Lineage: cmv_basetable.a SCRIPT []
POSTHOOK: Lineage: cmv_basetable.b SCRIPT []
POSTHOOK: Lineage: cmv_basetable.c SCRIPT []
-PREHOOK: query: create materialized view cmv_mat_view as select a, b, c from cmv_basetable
+PREHOOK: query: create materialized view cmv_mat_view disable rewrite as select a, b, c from cmv_basetable
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@cmv_basetable
PREHOOK: Output: database:default
PREHOOK: Output: default@cmv_mat_view
-POSTHOOK: query: create materialized view cmv_mat_view as select a, b, c from cmv_basetable
+POSTHOOK: query: create materialized view cmv_mat_view disable rewrite as select a, b, c from cmv_basetable
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@cmv_basetable
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_replace_with_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_replace_with_view.q.out b/ql/src/test/results/clientnegative/materialized_view_replace_with_view.q.out
index e2e7132..1cc0047 100644
--- a/ql/src/test/results/clientnegative/materialized_view_replace_with_view.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_replace_with_view.q.out
@@ -17,12 +17,12 @@ POSTHOOK: Output: default@rmvwv_basetable
POSTHOOK: Lineage: rmvwv_basetable.a SCRIPT []
POSTHOOK: Lineage: rmvwv_basetable.b SCRIPT []
POSTHOOK: Lineage: rmvwv_basetable.c SCRIPT []
-PREHOOK: query: create materialized view rmvwv_mat_view as select a, b, c from rmvwv_basetable
+PREHOOK: query: create materialized view rmvwv_mat_view disable rewrite as select a, b, c from rmvwv_basetable
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@rmvwv_basetable
PREHOOK: Output: database:default
PREHOOK: Output: default@rmvwv_mat_view
-POSTHOOK: query: create materialized view rmvwv_mat_view as select a, b, c from rmvwv_basetable
+POSTHOOK: query: create materialized view rmvwv_mat_view disable rewrite as select a, b, c from rmvwv_basetable
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@rmvwv_basetable
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientnegative/materialized_view_update.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/materialized_view_update.q.out b/ql/src/test/results/clientnegative/materialized_view_update.q.out
index b9e7761..4597022 100644
--- a/ql/src/test/results/clientnegative/materialized_view_update.q.out
+++ b/ql/src/test/results/clientnegative/materialized_view_update.q.out
@@ -6,12 +6,12 @@ POSTHOOK: query: create table umv_basetable (a int, b varchar(256), c decimal(10
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@umv_basetable
-PREHOOK: query: create materialized view umv_mat_view as select a, b, c from umv_basetable
+PREHOOK: query: create materialized view umv_mat_view disable rewrite as select a, b, c from umv_basetable
PREHOOK: type: CREATE_MATERIALIZED_VIEW
PREHOOK: Input: default@umv_basetable
PREHOOK: Output: database:default
PREHOOK: Output: default@umv_mat_view
-POSTHOOK: query: create materialized view umv_mat_view as select a, b, c from umv_basetable
+POSTHOOK: query: create materialized view umv_mat_view disable rewrite as select a, b, c from umv_basetable
POSTHOOK: type: CREATE_MATERIALIZED_VIEW
POSTHOOK: Input: default@umv_basetable
POSTHOOK: Output: database:default
http://git-wip-us.apache.org/repos/asf/hive/blob/6a24a0c5/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
index a8548c2..a0f916b 100644
--- a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
+++ b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out
@@ -38,13 +38,13 @@ POSTHOOK: type: ANALYZE_TABLE
POSTHOOK: Input: default@cmv_basetable_n10
#### A masked pattern was here ####
POSTHOOK: Output: default@cmv_basetable_n10
-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