diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index a721da7..2c89128 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -7130,7 +7130,9 @@ private Operator genPostGroupByBodyPlan(Operator curr, String dest, QB qb) extraMRStep); qb.getParseInfo().setOuterQueryLimit(limit.intValue()); } - curr = genFileSinkPlan(dest, qb, curr); + if (!SessionState.get().getHiveOperation().equals(HiveOperation.CREATEVIEW)) { + curr = genFileSinkPlan(dest, qb, curr); + } } // change curr ops row resolver's tab aliases to query alias if it diff --git ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out index 2b8b516..883c8c3 100644 --- ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out +++ ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out @@ -4,7 +4,6 @@ SELECT key, value FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW testViewPart PARTITIONED ON (value) AS SELECT key, value @@ -12,7 +11,6 @@ FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@testViewPart -#### A masked pattern was here #### PREHOOK: query: ALTER VIEW testViewPart ADD PARTITION (value='val_86') PARTITION (value='val_xyz') PREHOOK: type: ALTERTABLE_ADDPARTS diff --git ql/src/test/results/clientnegative/alter_view_failure.q.out ql/src/test/results/clientnegative/alter_view_failure.q.out index 80d512a..4bda31e 100644 --- ql/src/test/results/clientnegative/alter_view_failure.q.out +++ ql/src/test/results/clientnegative/alter_view_failure.q.out @@ -4,9 +4,7 @@ POSTHOOK: query: DROP VIEW xxx3 POSTHOOK: type: DROPVIEW PREHOOK: query: CREATE VIEW xxx3 AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx3 AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx3 -#### A masked pattern was here #### FAILED: SemanticException [Error 10131]: To alter a view you need to use the ALTER VIEW command. diff --git ql/src/test/results/clientnegative/alter_view_failure2.q.out ql/src/test/results/clientnegative/alter_view_failure2.q.out index 7c60a21..a27094a 100644 --- ql/src/test/results/clientnegative/alter_view_failure2.q.out +++ ql/src/test/results/clientnegative/alter_view_failure2.q.out @@ -7,12 +7,10 @@ PARTITIONED ON (value) AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx4 PARTITIONED ON (value) AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx4 -#### A masked pattern was here #### FAILED: SemanticException [Error 10131]: To alter a view you need to use the ALTER VIEW command. diff --git ql/src/test/results/clientnegative/alter_view_failure4.q.out ql/src/test/results/clientnegative/alter_view_failure4.q.out index 0a80c49..ab7f0ee 100644 --- ql/src/test/results/clientnegative/alter_view_failure4.q.out +++ ql/src/test/results/clientnegative/alter_view_failure4.q.out @@ -7,14 +7,12 @@ PARTITIONED ON (value) AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx5 PARTITIONED ON (value) AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx5 -#### A masked pattern was here #### PREHOOK: query: -- should fail: LOCATION clause is illegal #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS diff --git ql/src/test/results/clientnegative/alter_view_failure5.q.out ql/src/test/results/clientnegative/alter_view_failure5.q.out index b23ba8a..4edb82c 100644 --- ql/src/test/results/clientnegative/alter_view_failure5.q.out +++ ql/src/test/results/clientnegative/alter_view_failure5.q.out @@ -7,12 +7,10 @@ PARTITIONED ON (value) AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx6 PARTITIONED ON (value) AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx6 -#### A masked pattern was here #### FAILED: SemanticException [Error 10214]: Invalid partition spec specified value not found in table's partition spec: {v=val_86} diff --git ql/src/test/results/clientnegative/alter_view_failure6.q.out ql/src/test/results/clientnegative/alter_view_failure6.q.out index b6c87c9..0274e0b 100644 --- ql/src/test/results/clientnegative/alter_view_failure6.q.out +++ ql/src/test/results/clientnegative/alter_view_failure6.q.out @@ -7,13 +7,11 @@ PARTITIONED ON (key) AS SELECT hr,key FROM srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx7 PARTITIONED ON (key) AS SELECT hr,key FROM srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx7 -#### A masked pattern was here #### FAILED: SemanticException [Error 10041]: No partition predicate found for Alias "xxx7:srcpart" Table "srcpart" FAILED: SemanticException [Error 10056]: The query does not reference any valid partition. To run this query, set hive.mapred.mode=nonstrict diff --git ql/src/test/results/clientnegative/alter_view_failure7.q.out ql/src/test/results/clientnegative/alter_view_failure7.q.out index 768c5b1..e2967b1 100644 --- ql/src/test/results/clientnegative/alter_view_failure7.q.out +++ ql/src/test/results/clientnegative/alter_view_failure7.q.out @@ -7,12 +7,10 @@ PARTITIONED ON (ds,hr) AS SELECT key,ds,hr FROM srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx8 PARTITIONED ON (ds,hr) AS SELECT key,ds,hr FROM srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx8 -#### A masked pattern was here #### FAILED: SemanticException [Error 10214]: Invalid partition spec specified table is partitioned but partition spec is not specified or does not fully match table partitioning: {ds=2011-01-01} diff --git ql/src/test/results/clientnegative/alter_view_failure9.q.out ql/src/test/results/clientnegative/alter_view_failure9.q.out index 7753477..6003d7d 100644 --- ql/src/test/results/clientnegative/alter_view_failure9.q.out +++ ql/src/test/results/clientnegative/alter_view_failure9.q.out @@ -6,11 +6,9 @@ PREHOOK: query: CREATE VIEW xxx4 AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx4 AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx4 -#### A masked pattern was here #### FAILED: SemanticException [Error 10131]: To alter a view you need to use the ALTER VIEW command. diff --git ql/src/test/results/clientnegative/analyze_view.q.out ql/src/test/results/clientnegative/analyze_view.q.out index 8e632f1..c321543 100644 --- ql/src/test/results/clientnegative/analyze_view.q.out +++ ql/src/test/results/clientnegative/analyze_view.q.out @@ -4,9 +4,7 @@ POSTHOOK: query: DROP VIEW av POSTHOOK: type: DROPVIEW PREHOOK: query: CREATE VIEW av AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW av AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@av -#### A masked pattern was here #### FAILED: SemanticException [Error 10091]: ANALYZE is not supported for views diff --git ql/src/test/results/clientnegative/create_or_replace_view1.q.out ql/src/test/results/clientnegative/create_or_replace_view1.q.out index 19eb839..6b5b504 100644 --- ql/src/test/results/clientnegative/create_or_replace_view1.q.out +++ ql/src/test/results/clientnegative/create_or_replace_view1.q.out @@ -8,11 +8,9 @@ drop view v POSTHOOK: type: DROPVIEW PREHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### PREHOOK: query: alter view v add partition (ds='1',hr='2') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@srcpart diff --git ql/src/test/results/clientnegative/create_or_replace_view2.q.out ql/src/test/results/clientnegative/create_or_replace_view2.q.out index 238e1a2..19a2468 100644 --- ql/src/test/results/clientnegative/create_or_replace_view2.q.out +++ ql/src/test/results/clientnegative/create_or_replace_view2.q.out @@ -8,11 +8,9 @@ drop view v POSTHOOK: type: DROPVIEW PREHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### PREHOOK: query: alter view v add partition (ds='1',hr='2') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@srcpart diff --git ql/src/test/results/clientnegative/create_or_replace_view4.q.out ql/src/test/results/clientnegative/create_or_replace_view4.q.out index 6ef8b80..a1d158f 100644 --- ql/src/test/results/clientnegative/create_or_replace_view4.q.out +++ ql/src/test/results/clientnegative/create_or_replace_view4.q.out @@ -8,9 +8,7 @@ drop view v POSTHOOK: type: DROPVIEW PREHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### FAILED: SemanticException [Error 10092]: At least one non-partitioning column must be present in view diff --git ql/src/test/results/clientnegative/create_or_replace_view5.q.out ql/src/test/results/clientnegative/create_or_replace_view5.q.out index ff5ec3b..03576fb 100644 --- ql/src/test/results/clientnegative/create_or_replace_view5.q.out +++ ql/src/test/results/clientnegative/create_or_replace_view5.q.out @@ -8,9 +8,7 @@ drop view v POSTHOOK: type: DROPVIEW PREHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### FAILED: SemanticException Can't combine IF NOT EXISTS and OR REPLACE. diff --git ql/src/test/results/clientnegative/create_or_replace_view6.q.out ql/src/test/results/clientnegative/create_or_replace_view6.q.out index b53e42a..d873403 100644 --- ql/src/test/results/clientnegative/create_or_replace_view6.q.out +++ ql/src/test/results/clientnegative/create_or_replace_view6.q.out @@ -8,10 +8,8 @@ drop view v POSTHOOK: type: DROPVIEW PREHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### FAILED: ParseException line 2:52 cannot recognize input near 'blah' '' '' in select clause diff --git ql/src/test/results/clientnegative/create_or_replace_view7.q.out ql/src/test/results/clientnegative/create_or_replace_view7.q.out index 5c225a5..0abfc3d 100644 --- ql/src/test/results/clientnegative/create_or_replace_view7.q.out +++ ql/src/test/results/clientnegative/create_or_replace_view7.q.out @@ -8,29 +8,23 @@ drop view v POSTHOOK: type: DROPVIEW PREHOOK: query: create view v1 partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view v1 partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v1 -#### A masked pattern was here #### PREHOOK: query: create view v2 partitioned on (ds, hr) as select * from v1 PREHOOK: type: CREATEVIEW PREHOOK: Input: default@v1 -#### A masked pattern was here #### POSTHOOK: query: create view v2 partitioned on (ds, hr) as select * from v1 POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@v1 POSTHOOK: Output: default@v2 -#### A masked pattern was here #### PREHOOK: query: create view v3 partitioned on (ds, hr) as select * from v2 PREHOOK: type: CREATEVIEW PREHOOK: Input: default@v1 PREHOOK: Input: default@v2 -#### A masked pattern was here #### POSTHOOK: query: create view v3 partitioned on (ds, hr) as select * from v2 POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@v1 POSTHOOK: Input: default@v2 POSTHOOK: Output: default@v3 -#### A masked pattern was here #### FAILED: SemanticException Recursive view default.v1 detected (cycle: default.v1 -> default.v3 -> default.v2 -> default.v1). diff --git ql/src/test/results/clientnegative/create_or_replace_view8.q.out ql/src/test/results/clientnegative/create_or_replace_view8.q.out index 44f0a74..a46ce12 100644 --- ql/src/test/results/clientnegative/create_or_replace_view8.q.out +++ ql/src/test/results/clientnegative/create_or_replace_view8.q.out @@ -8,9 +8,7 @@ drop view v POSTHOOK: type: DROPVIEW PREHOOK: query: create view v1 partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view v1 partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v1 -#### A masked pattern was here #### FAILED: SemanticException Recursive view default.v1 detected (cycle: default.v1 -> default.v1). diff --git ql/src/test/results/clientnegative/create_view_failure2.q.out ql/src/test/results/clientnegative/create_view_failure2.q.out index c16f698..fcae7f8 100644 --- ql/src/test/results/clientnegative/create_view_failure2.q.out +++ ql/src/test/results/clientnegative/create_view_failure2.q.out @@ -5,12 +5,10 @@ POSTHOOK: type: DROPVIEW PREHOOK: query: -- views and tables share the same namespace CREATE VIEW xxx4 AS SELECT key FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- views and tables share the same namespace CREATE VIEW xxx4 AS SELECT key FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx4 -#### A masked pattern was here #### PREHOOK: query: CREATE TABLE xxx4(key int) PREHOOK: type: CREATETABLE FAILED: Error in metadata: AlreadyExistsException(message:Table xxx4 already exists) diff --git ql/src/test/results/clientnegative/drop_table_failure2.q.out ql/src/test/results/clientnegative/drop_table_failure2.q.out index fd3f33a..809f16f 100644 --- ql/src/test/results/clientnegative/drop_table_failure2.q.out +++ ql/src/test/results/clientnegative/drop_table_failure2.q.out @@ -1,10 +1,8 @@ PREHOOK: query: CREATE VIEW xxx6 AS SELECT key FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx6 AS SELECT key FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx6 -#### A masked pattern was here #### PREHOOK: query: -- Can't use DROP TABLE on a view DROP TABLE xxx6 PREHOOK: type: DROPTABLE diff --git ql/src/test/results/clientnegative/insert_view_failure.q.out ql/src/test/results/clientnegative/insert_view_failure.q.out index 067eb6f..0e43ee9 100644 --- ql/src/test/results/clientnegative/insert_view_failure.q.out +++ ql/src/test/results/clientnegative/insert_view_failure.q.out @@ -4,9 +4,7 @@ POSTHOOK: query: DROP VIEW xxx2 POSTHOOK: type: DROPVIEW PREHOOK: query: CREATE VIEW xxx2 AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx2 AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx2 -#### A masked pattern was here #### FAILED: SemanticException [Error 10090]: A view cannot be used as target table for LOAD or INSERT diff --git ql/src/test/results/clientnegative/invalidate_view1.q.out ql/src/test/results/clientnegative/invalidate_view1.q.out index 400c697..9f3870e 100644 --- ql/src/test/results/clientnegative/invalidate_view1.q.out +++ ql/src/test/results/clientnegative/invalidate_view1.q.out @@ -19,20 +19,16 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@xxx10 PREHOOK: query: CREATE VIEW xxx9 AS SELECT * FROM xxx10 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx9 AS SELECT * FROM xxx10 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx9 -#### A masked pattern was here #### PREHOOK: query: CREATE VIEW xxx8 AS SELECT * FROM xxx9 xxx PREHOOK: type: CREATEVIEW PREHOOK: Input: default@xxx9 -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx8 AS SELECT * FROM xxx9 xxx POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@xxx9 POSTHOOK: Output: default@xxx8 -#### A masked pattern was here #### PREHOOK: query: ALTER TABLE xxx10 REPLACE COLUMNS (key int) PREHOOK: type: ALTERTABLE_REPLACECOLS PREHOOK: Input: default@xxx10 diff --git ql/src/test/results/clientnegative/load_view_failure.q.out ql/src/test/results/clientnegative/load_view_failure.q.out index bb2ecfe..68223f0 100644 --- ql/src/test/results/clientnegative/load_view_failure.q.out +++ ql/src/test/results/clientnegative/load_view_failure.q.out @@ -4,9 +4,7 @@ POSTHOOK: query: DROP VIEW xxx11 POSTHOOK: type: DROPVIEW PREHOOK: query: CREATE VIEW xxx11 AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW xxx11 AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@xxx11 -#### A masked pattern was here #### FAILED: SemanticException [Error 10090]: A view cannot be used as target table for LOAD or INSERT diff --git ql/src/test/results/clientnegative/recursive_view.q.out ql/src/test/results/clientnegative/recursive_view.q.out index a65ed8b..3a2618b 100644 --- ql/src/test/results/clientnegative/recursive_view.q.out +++ ql/src/test/results/clientnegative/recursive_view.q.out @@ -29,44 +29,36 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@t PREHOOK: query: create view r0 as select * from t PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view r0 as select * from t POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@r0 -#### A masked pattern was here #### PREHOOK: query: create view r1 as select * from r0 PREHOOK: type: CREATEVIEW PREHOOK: Input: default@r0 -#### A masked pattern was here #### POSTHOOK: query: create view r1 as select * from r0 POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@r0 POSTHOOK: Output: default@r1 -#### A masked pattern was here #### PREHOOK: query: create view r2 as select * from r1 PREHOOK: type: CREATEVIEW PREHOOK: Input: default@r0 PREHOOK: Input: default@r1 -#### A masked pattern was here #### POSTHOOK: query: create view r2 as select * from r1 POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@r0 POSTHOOK: Input: default@r1 POSTHOOK: Output: default@r2 -#### A masked pattern was here #### PREHOOK: query: create view r3 as select * from r2 PREHOOK: type: CREATEVIEW PREHOOK: Input: default@r0 PREHOOK: Input: default@r1 PREHOOK: Input: default@r2 -#### A masked pattern was here #### POSTHOOK: query: create view r3 as select * from r2 POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@r0 POSTHOOK: Input: default@r1 POSTHOOK: Input: default@r2 POSTHOOK: Output: default@r3 -#### A masked pattern was here #### PREHOOK: query: drop view r0 PREHOOK: type: DROPVIEW PREHOOK: Input: default@r0 diff --git ql/src/test/results/clientnegative/unset_view_property.q.out ql/src/test/results/clientnegative/unset_view_property.q.out index 4d534b4..487dc63 100644 --- ql/src/test/results/clientnegative/unset_view_property.q.out +++ ql/src/test/results/clientnegative/unset_view_property.q.out @@ -1,10 +1,8 @@ PREHOOK: query: CREATE VIEW testView AS SELECT value FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW testView AS SELECT value FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@testView -#### A masked pattern was here #### PREHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB'='200') PREHOOK: type: ALTERVIEW_PROPERTIES PREHOOK: Input: default@testview diff --git ql/src/test/results/clientpositive/alter_view_as_select.q.out ql/src/test/results/clientpositive/alter_view_as_select.q.out index bc00e1e..41f95c1 100644 --- ql/src/test/results/clientpositive/alter_view_as_select.q.out +++ ql/src/test/results/clientpositive/alter_view_as_select.q.out @@ -4,11 +4,9 @@ POSTHOOK: query: DROP VIEW testView POSTHOOK: type: DROPVIEW PREHOOK: query: CREATE VIEW testView as SELECT * FROM srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW testView as SELECT * FROM srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@testView -#### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED testView PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED testView @@ -43,11 +41,9 @@ View Original Text: SELECT * FROM srcpart View Expanded Text: SELECT `srcpart`.`key`, `srcpart`.`value`, `srcpart`.`ds`, `srcpart`.`hr` FROM `default`.`srcpart` PREHOOK: query: ALTER VIEW testView AS SELECT value FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: ALTER VIEW testView AS SELECT value FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@testview -#### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED testView PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED testView @@ -83,7 +79,6 @@ WHERE key > 80 AND key < 100 ORDER BY key, value LIMIT 10 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: ALTER VIEW testView AS SELECT * FROM src WHERE key > 80 AND key < 100 @@ -91,7 +86,6 @@ ORDER BY key, value LIMIT 10 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@testview -#### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED testView PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED testView diff --git ql/src/test/results/clientpositive/alter_view_rename.q.out ql/src/test/results/clientpositive/alter_view_rename.q.out index 23fe432..9ff7c9c 100644 --- ql/src/test/results/clientpositive/alter_view_rename.q.out +++ ql/src/test/results/clientpositive/alter_view_rename.q.out @@ -5,11 +5,9 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@invites PREHOOK: query: CREATE VIEW view1 as SELECT * FROM invites PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view1 as SELECT * FROM invites POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view1 -#### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view1 diff --git ql/src/test/results/clientpositive/create_big_view.q.out ql/src/test/results/clientpositive/create_big_view.q.out index 0d90173..20a4dc1 100644 --- ql/src/test/results/clientpositive/create_big_view.q.out +++ ql/src/test/results/clientpositive/create_big_view.q.out @@ -242,7 +242,6 @@ CREATE VIEW big_view AS SELECT 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- Define a view with long SQL text to test metastore and other limits. CREATE VIEW big_view AS SELECT @@ -484,7 +483,6 @@ CREATE VIEW big_view AS SELECT FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@big_view -#### A masked pattern was here #### PREHOOK: query: SELECT a FROM big_view LIMIT 1 PREHOOK: type: QUERY diff --git ql/src/test/results/clientpositive/create_like_tbl_props.q.out ql/src/test/results/clientpositive/create_like_tbl_props.q.out index 37b4b2c..039fbe3 100644 --- ql/src/test/results/clientpositive/create_like_tbl_props.q.out +++ ql/src/test/results/clientpositive/create_like_tbl_props.q.out @@ -160,13 +160,11 @@ PREHOOK: query: --Test that CREATE TALBE LIKE on a view can take explicit table CREATE VIEW test_view (key, value) AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: --Test that CREATE TALBE LIKE on a view can take explicit table properties CREATE VIEW test_view (key, value) AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@test_view -#### A masked pattern was here #### PREHOOK: query: CREATE TABLE test_table4 LIKE test_view TBLPROPERTIES('key'='value') PREHOOK: type: CREATETABLE POSTHOOK: query: CREATE TABLE test_table4 LIKE test_view TBLPROPERTIES('key'='value') diff --git ql/src/test/results/clientpositive/create_like_view.q.out ql/src/test/results/clientpositive/create_like_view.q.out index cb43bb3..7e640f6 100644 --- ql/src/test/results/clientpositive/create_like_view.q.out +++ ql/src/test/results/clientpositive/create_like_view.q.out @@ -58,11 +58,9 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: CREATE VIEW view1 AS SELECT * FROM table1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view1 AS SELECT * FROM table1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view1 -#### A masked pattern was here #### PREHOOK: query: CREATE TABLE table2 LIKE view1 PREHOOK: type: CREATETABLE POSTHOOK: query: CREATE TABLE table2 LIKE view1 @@ -244,12 +242,10 @@ POSTHOOK: Lineage: table2.b SIMPLE [(src)src.FieldSchema(name:value, type:string PREHOOK: query: -- check partitions create view view1 partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- check partitions create view view1 partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view1 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.a SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: table1.b SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: table2.a SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git ql/src/test/results/clientpositive/create_or_replace_view.q.out ql/src/test/results/clientpositive/create_or_replace_view.q.out index a126b80..bb9b669 100644 --- ql/src/test/results/clientpositive/create_or_replace_view.q.out +++ ql/src/test/results/clientpositive/create_or_replace_view.q.out @@ -4,11 +4,9 @@ POSTHOOK: query: drop view v POSTHOOK: type: DROPVIEW PREHOOK: query: create view v as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view v as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### PREHOOK: query: describe formatted v PREHOOK: type: DESCTABLE POSTHOOK: query: describe formatted v @@ -44,12 +42,10 @@ View Expanded Text: select `srcpart`.`key`, `srcpart`.`value`, `srcpart`.`ds`, PREHOOK: query: -- modifying definition of unpartitioned view create or replace view v partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- modifying definition of unpartitioned view create or replace view v partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### PREHOOK: query: alter view v add partition (ds='2008-04-08',hr='11') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@srcpart @@ -132,12 +128,10 @@ ds=2008-04-08/hr=12 PREHOOK: query: -- altering partitioned view 1 create or replace view v partitioned on (ds, hr) as select value, ds, hr from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- altering partitioned view 1 create or replace view v partitioned on (ds, hr) as select value, ds, hr from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### PREHOOK: query: select * from v where value='val_409' and ds='2008-04-08' and hr='11' PREHOOK: type: QUERY PREHOOK: Input: default@srcpart @@ -197,12 +191,10 @@ ds=2008-04-08/hr=12 PREHOOK: query: -- altering partitioned view 2 create or replace view v partitioned on (ds, hr) as select key, value, ds, hr from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- altering partitioned view 2 create or replace view v partitioned on (ds, hr) as select key, value, ds, hr from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### PREHOOK: query: select * from v where value='val_409' and ds='2008-04-08' and hr='11' PREHOOK: type: QUERY PREHOOK: Input: default@srcpart @@ -277,11 +269,9 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@srcpart_temp PREHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart_temp PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart_temp POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### PREHOOK: query: drop table srcpart_temp PREHOOK: type: DROPTABLE PREHOOK: Input: default@srcpart_temp @@ -293,12 +283,10 @@ POSTHOOK: Output: default@srcpart_temp PREHOOK: query: -- v is now invalid create or replace view v partitioned on (ds, hr) as select * from srcpart PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- v is now invalid create or replace view v partitioned on (ds, hr) as select * from srcpart POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### PREHOOK: query: describe formatted v PREHOOK: type: DESCTABLE POSTHOOK: query: describe formatted v diff --git ql/src/test/results/clientpositive/create_view.q.out ql/src/test/results/clientpositive/create_view.q.out index e1e8cea..caa0254 100644 --- ql/src/test/results/clientpositive/create_view.q.out +++ ql/src/test/results/clientpositive/create_view.q.out @@ -85,29 +85,23 @@ POSTHOOK: Input: default@src 86 val_86 PREHOOK: query: CREATE VIEW view1 AS SELECT value FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view1 AS SELECT value FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view1 -#### A masked pattern was here #### PREHOOK: query: CREATE VIEW view2 AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view2 AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view2 -#### A masked pattern was here #### PREHOOK: query: CREATE VIEW view3(valoo) TBLPROPERTIES ("fear" = "factor") AS SELECT upper(value) FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view3(valoo) TBLPROPERTIES ("fear" = "factor") AS SELECT upper(value) FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view3 -#### A masked pattern was here #### PREHOOK: query: SELECT * from view1 PREHOOK: type: QUERY PREHOOK: Input: default@src @@ -470,11 +464,9 @@ POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:st 86 PREHOOK: query: CREATE VIEW view4 AS SELECT * FROM table1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view4 AS SELECT * FROM table1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view4 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: SELECT * FROM view4 PREHOOK: type: QUERY @@ -548,13 +540,11 @@ PREHOOK: query: CREATE VIEW view5 AS SELECT v1.key as key1, v2.key as key2 FROM view4 v1 join view4 v2 PREHOOK: type: CREATEVIEW PREHOOK: Input: default@view4 -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view5 AS SELECT v1.key as key1, v2.key as key2 FROM view4 v1 join view4 v2 POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@view4 POSTHOOK: Output: default@view5 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: SELECT * FROM view5 PREHOOK: type: QUERY @@ -584,14 +574,12 @@ PREHOOK: query: -- verify that column name and comment in DDL portion CREATE VIEW view6(valoo COMMENT 'I cannot spell') AS SELECT upper(value) as blarg FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- verify that column name and comment in DDL portion -- overrides column alias in SELECT CREATE VIEW view6(valoo COMMENT 'I cannot spell') AS SELECT upper(value) as blarg FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view6 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE view6 PREHOOK: type: DESCTABLE @@ -608,7 +596,6 @@ WHERE key > 80 AND key < 100 ORDER BY key, value LIMIT 10 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- verify that ORDER BY and LIMIT are both supported in view def CREATE VIEW view7 AS SELECT * FROM src @@ -617,7 +604,6 @@ ORDER BY key, value LIMIT 10 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view7 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: SELECT * FROM view7 PREHOOK: type: QUERY @@ -721,13 +707,11 @@ PREHOOK: query: CREATE VIEW view8(c) AS SELECT test_translate('abc', 'a', 'b') FROM table1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view8(c) AS SELECT test_translate('abc', 'a', 'b') FROM table1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view8 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view8 PREHOOK: type: DESCTABLE @@ -799,14 +783,12 @@ CREATE VIEW view9(m) AS SELECT test_max(length(value)) FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- disable map-side aggregation CREATE VIEW view9(m) AS SELECT test_max(length(value)) FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view9 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view9 PREHOOK: type: DESCTABLE @@ -878,14 +860,12 @@ CREATE VIEW view9(m) AS SELECT test_max(length(value)) FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- enable map-side aggregation CREATE VIEW view9(m) AS SELECT test_max(length(value)) FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view9 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view9 PREHOOK: type: DESCTABLE @@ -947,13 +927,11 @@ PREHOOK: query: -- test usage of a subselect within a view CREATE VIEW view10 AS SELECT slurp.* FROM (SELECT * FROM src WHERE key=86) slurp PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test usage of a subselect within a view CREATE VIEW view10 AS SELECT slurp.* FROM (SELECT * FROM src WHERE key=86) slurp POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view10 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view10 PREHOOK: type: DESCTABLE @@ -1022,13 +1000,11 @@ PREHOOK: query: CREATE VIEW view11 AS SELECT test_explode(array(1,2,3)) AS (boom) FROM table1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view11 AS SELECT test_explode(array(1,2,3)) AS (boom) FROM table1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view11 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view11 PREHOOK: type: DESCTABLE @@ -1092,13 +1068,11 @@ PREHOOK: query: -- test usage of LATERAL within a view CREATE VIEW view12 AS SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test usage of LATERAL within a view CREATE VIEW view12 AS SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view12 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view12 PREHOOK: type: DESCTABLE @@ -1179,14 +1153,12 @@ CREATE VIEW view13 AS SELECT s.key FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 ON key) s PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test usage of TABLESAMPLE within a view CREATE VIEW view13 AS SELECT s.key FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 ON key) s POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view13 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view13 PREHOOK: type: DESCTABLE @@ -1270,7 +1242,6 @@ JOIN select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2 ON (unionsrc1.key = unionsrc2.key) PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test usage of JOIN+UNION+AGG all within same view CREATE VIEW view14 AS SELECT unionsrc1.key as k1, unionsrc1.value as v1, @@ -1285,7 +1256,6 @@ JOIN ON (unionsrc1.key = unionsrc2.key) POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view14 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view14 PREHOOK: type: DESCTABLE @@ -1411,7 +1381,6 @@ SELECT key,COUNT(value) AS value_count FROM src GROUP BY key PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test usage of GROUP BY within view CREATE VIEW view15 AS SELECT key,COUNT(value) AS value_count @@ -1419,7 +1388,6 @@ FROM src GROUP BY key POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view15 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view15 PREHOOK: type: DESCTABLE @@ -1501,14 +1469,12 @@ CREATE VIEW view16 AS SELECT DISTINCT value FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test usage of DISTINCT within view CREATE VIEW view16 AS SELECT DISTINCT value FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view16 -#### A masked pattern was here #### POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE EXTENDED view16 PREHOOK: type: DESCTABLE diff --git ql/src/test/results/clientpositive/create_view_partitioned.q.out ql/src/test/results/clientpositive/create_view_partitioned.q.out index d5d5dcb..4dca237 100644 --- ql/src/test/results/clientpositive/create_view_partitioned.q.out +++ ql/src/test/results/clientpositive/create_view_partitioned.q.out @@ -19,7 +19,6 @@ SELECT key, value FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test partitioned view definition -- (underlying table is not actually partitioned) CREATE VIEW vp1 @@ -30,7 +29,6 @@ FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@vp1 -#### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED vp1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED vp1 @@ -234,7 +232,6 @@ CREATE VIEW vp2 PARTITIONED ON (hr) AS SELECT * FROM srcpart WHERE key < 10 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test a partitioned view on top of an underlying partitioned table, -- but with only a suffix of the partitioning columns CREATE VIEW vp2 @@ -242,7 +239,6 @@ PARTITIONED ON (hr) AS SELECT * FROM srcpart WHERE key < 10 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@vp2 -#### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED vp2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED vp2 @@ -340,7 +336,6 @@ SELECT key, value FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test a partitioned view where the PARTITIONED ON clause references -- an imposed column name CREATE VIEW vp3(k,v) @@ -351,7 +346,6 @@ FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@vp3 -#### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED vp3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED vp3 diff --git ql/src/test/results/clientpositive/database_drop.q.out ql/src/test/results/clientpositive/database_drop.q.out index 86e0dde..6c4440f 100644 --- ql/src/test/results/clientpositive/database_drop.q.out +++ ql/src/test/results/clientpositive/database_drop.q.out @@ -40,11 +40,9 @@ POSTHOOK: type: LOAD POSTHOOK: Output: db5@temp_tbl PREHOOK: query: CREATE VIEW temp_tbl_view AS SELECT * FROM temp_tbl PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW temp_tbl_view AS SELECT * FROM temp_tbl POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db5@temp_tbl_view -#### A masked pattern was here #### PREHOOK: query: CREATE INDEX idx1 ON TABLE temp_tbl(id) AS 'COMPACT' with DEFERRED REBUILD PREHOOK: type: CREATEINDEX POSTHOOK: query: CREATE INDEX idx1 ON TABLE temp_tbl(id) AS 'COMPACT' with DEFERRED REBUILD @@ -82,11 +80,9 @@ POSTHOOK: Lineage: db5__temp_tbl_idx1__._offsets EXPRESSION [(temp_tbl)temp_tbl. POSTHOOK: Lineage: db5__temp_tbl_idx1__.id SIMPLE [(temp_tbl)temp_tbl.FieldSchema(name:id, type:int, comment:null), ] PREHOOK: query: CREATE VIEW temp_tbl2_view AS SELECT * FROM temp_tbl2 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW temp_tbl2_view AS SELECT * FROM temp_tbl2 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db5@temp_tbl2_view -#### A masked pattern was here #### POSTHOOK: Lineage: db5__temp_tbl_idx1__._bucketname SIMPLE [(temp_tbl)temp_tbl.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: db5__temp_tbl_idx1__._offsets EXPRESSION [(temp_tbl)temp_tbl.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ] POSTHOOK: Lineage: db5__temp_tbl_idx1__.id SIMPLE [(temp_tbl)temp_tbl.FieldSchema(name:id, type:int, comment:null), ] diff --git ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out index 25ef1ff..e384a4d 100644 --- ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out +++ ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out @@ -9,7 +9,6 @@ SELECT key, value FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view_partitioned PARTITIONED ON (value) AS @@ -18,7 +17,6 @@ FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view_partitioned -#### A masked pattern was here #### PREHOOK: query: ALTER VIEW view_partitioned ADD PARTITION (value='val_86') PREHOOK: type: ALTERTABLE_ADDPARTS diff --git ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out index 77dbd7f..ba56c0b 100644 --- ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out +++ ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out @@ -9,7 +9,6 @@ SELECT key, value FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW view_partitioned PARTITIONED ON (value) AS @@ -18,7 +17,6 @@ FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@view_partitioned -#### A masked pattern was here #### PREHOOK: query: ALTER VIEW view_partitioned ADD PARTITION (value='val_86') PREHOOK: type: ALTERTABLE_ADDPARTS diff --git ql/src/test/results/clientpositive/explain_dependency.q.out ql/src/test/results/clientpositive/explain_dependency.q.out index 7254852..2f272bb 100644 --- ql/src/test/results/clientpositive/explain_dependency.q.out +++ ql/src/test/results/clientpositive/explain_dependency.q.out @@ -3,41 +3,34 @@ PREHOOK: query: -- This test is used for testing EXPLAIN DEPENDENCY command -- Create some views CREATE VIEW V1 AS SELECT key, value from src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- This test is used for testing EXPLAIN DEPENDENCY command -- Create some views CREATE VIEW V1 AS SELECT key, value from src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@V1 -#### A masked pattern was here #### PREHOOK: query: CREATE VIEW V2 AS SELECT ds, key, value FROM srcpart WHERE ds IS NOT NULL PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW V2 AS SELECT ds, key, value FROM srcpart WHERE ds IS NOT NULL POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@V2 -#### A masked pattern was here #### PREHOOK: query: CREATE VIEW V3 AS SELECT src1.key, src2.value FROM V2 src1 JOIN src src2 ON src1.key = src2.key WHERE src1.ds IS NOT NULL PREHOOK: type: CREATEVIEW PREHOOK: Input: default@v2 -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW V3 AS SELECT src1.key, src2.value FROM V2 src1 JOIN src src2 ON src1.key = src2.key WHERE src1.ds IS NOT NULL POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@v2 POSTHOOK: Output: default@V3 -#### A masked pattern was here #### PREHOOK: query: CREATE VIEW V4 AS SELECT src1.key, src2.value as value1, src3.value as value2 FROM V1 src1 JOIN V2 src2 on src1.key = src2.key JOIN src src3 ON src2.key = src3.key PREHOOK: type: CREATEVIEW PREHOOK: Input: default@v1 PREHOOK: Input: default@v2 -#### A masked pattern was here #### POSTHOOK: query: CREATE VIEW V4 AS SELECT src1.key, src2.value as value1, src3.value as value2 FROM V1 src1 JOIN V2 src2 on src1.key = src2.key JOIN src src3 ON src2.key = src3.key @@ -45,7 +38,6 @@ POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@v1 POSTHOOK: Input: default@v2 POSTHOOK: Output: default@V4 -#### A masked pattern was here #### PREHOOK: query: -- Simple select queries, union queries and join queries EXPLAIN DEPENDENCY SELECT key, count(1) FROM srcpart WHERE ds IS NOT NULL GROUP BY key @@ -106,13 +98,11 @@ PREHOOK: query: -- The table should show up in the explain dependency even if no -- of the partitions are selected. CREATE VIEW V5 as SELECT * FROM srcpart where ds = '10' PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- The table should show up in the explain dependency even if none -- of the partitions are selected. CREATE VIEW V5 as SELECT * FROM srcpart where ds = '10' POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@V5 -#### A masked pattern was here #### PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V5 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V5 diff --git ql/src/test/results/clientpositive/join_view.q.out ql/src/test/results/clientpositive/join_view.q.out index 0e3c8b5..6913793 100644 --- ql/src/test/results/clientpositive/join_view.q.out +++ ql/src/test/results/clientpositive/join_view.q.out @@ -20,13 +20,11 @@ PREHOOK: query: -- test join views: see HIVE-1989 create view v as select invites.bar, invites2.foo, invites2.ds from invites join invites2 on invites.ds=invites2.ds PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- test join views: see HIVE-1989 create view v as select invites.bar, invites2.foo, invites2.ds from invites join invites2 on invites.ds=invites2.ds POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@v -#### A masked pattern was here #### PREHOOK: query: explain select * from v where ds='2011-09-01' PREHOOK: type: QUERY POSTHOOK: query: explain select * from v where ds='2011-09-01' diff --git ql/src/test/results/clientpositive/ppd_union_view.q.out ql/src/test/results/clientpositive/ppd_union_view.q.out index d511ed5..e3e404e 100644 --- ql/src/test/results/clientpositive/ppd_union_view.q.out +++ ql/src/test/results/clientpositive/ppd_union_view.q.out @@ -145,7 +145,6 @@ on t1_old.keymap = t1_mapping.keymap and t1_old.ds = t1_mapping.ds ) subq PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: create view t1 partitioned on (ds) as select * from ( @@ -157,7 +156,6 @@ on t1_old.keymap = t1_mapping.keymap and ) subq POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@t1 -#### A masked pattern was here #### POSTHOOK: Lineage: t1_mapping PARTITION(ds=2011-10-13).key SIMPLE [] POSTHOOK: Lineage: t1_mapping PARTITION(ds=2011-10-13).keymap SIMPLE [] POSTHOOK: Lineage: t1_mapping PARTITION(ds=2011-10-14).key SIMPLE [] diff --git ql/src/test/results/clientpositive/show_create_table_view.q.out ql/src/test/results/clientpositive/show_create_table_view.q.out index 5b89c18..035d454 100644 --- ql/src/test/results/clientpositive/show_create_table_view.q.out +++ ql/src/test/results/clientpositive/show_create_table_view.q.out @@ -2,13 +2,11 @@ PREHOOK: query: -- Test SHOW CREATE TABLE on a view name. CREATE VIEW tmp_copy_src AS SELECT * FROM src PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- Test SHOW CREATE TABLE on a view name. CREATE VIEW tmp_copy_src AS SELECT * FROM src POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@tmp_copy_src -#### A masked pattern was here #### PREHOOK: query: SHOW CREATE TABLE tmp_copy_src PREHOOK: type: SHOW_CREATETABLE PREHOOK: Input: default@tmp_copy_src diff --git ql/src/test/results/clientpositive/unset_table_view_property.q.out ql/src/test/results/clientpositive/unset_table_view_property.q.out index 2f4dfba..d39f492 100644 --- ql/src/test/results/clientpositive/unset_table_view_property.q.out +++ ql/src/test/results/clientpositive/unset_table_view_property.q.out @@ -159,12 +159,10 @@ a 1 PREHOOK: query: -- UNSET VIEW PROPERTIES CREATE VIEW testView AS SELECT value FROM src WHERE key=86 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- UNSET VIEW PROPERTIES CREATE VIEW testView AS SELECT value FROM src WHERE key=86 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: default@testView -#### A masked pattern was here #### PREHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB'='200') PREHOOK: type: ALTERVIEW_PROPERTIES PREHOOK: Input: default@testview diff --git ql/src/test/results/clientpositive/view.q.out ql/src/test/results/clientpositive/view.q.out index a96fe16..30d5b88 100644 --- ql/src/test/results/clientpositive/view.q.out +++ ql/src/test/results/clientpositive/view.q.out @@ -39,75 +39,59 @@ POSTHOOK: Output: db1@table2 PREHOOK: query: -- relative reference, no alias CREATE VIEW v1 AS SELECT * FROM table1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- relative reference, no alias CREATE VIEW v1 AS SELECT * FROM table1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db1@v1 -#### A masked pattern was here #### PREHOOK: query: -- relative reference, aliased CREATE VIEW v2 AS SELECT t1.* FROM table1 t1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- relative reference, aliased CREATE VIEW v2 AS SELECT t1.* FROM table1 t1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db1@v2 -#### A masked pattern was here #### PREHOOK: query: -- relative reference, multiple tables CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON t1.key = t2.key PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- relative reference, multiple tables CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON t1.key = t2.key POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db1@v3 -#### A masked pattern was here #### PREHOOK: query: -- absolute reference, no alias CREATE VIEW v4 AS SELECT * FROM db1.table1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- absolute reference, no alias CREATE VIEW v4 AS SELECT * FROM db1.table1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db1@v4 -#### A masked pattern was here #### PREHOOK: query: -- absolute reference, aliased CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- absolute reference, aliased CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db1@v5 -#### A masked pattern was here #### PREHOOK: query: -- absolute reference, multiple tables CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 ON t1.key = t2.key PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- absolute reference, multiple tables CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 ON t1.key = t2.key POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db1@v6 -#### A masked pattern was here #### PREHOOK: query: -- relative reference, explicit column CREATE VIEW v7 AS SELECT key from table1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- relative reference, explicit column CREATE VIEW v7 AS SELECT key from table1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db1@v7 -#### A masked pattern was here #### PREHOOK: query: -- absolute reference, explicit column CREATE VIEW v8 AS SELECT key from db1.table1 PREHOOK: type: CREATEVIEW -#### A masked pattern was here #### POSTHOOK: query: -- absolute reference, explicit column CREATE VIEW v8 AS SELECT key from db1.table1 POSTHOOK: type: CREATEVIEW POSTHOOK: Output: db1@v8 -#### A masked pattern was here #### PREHOOK: query: CREATE DATABASE db2 PREHOOK: type: CREATEDATABASE POSTHOOK: query: CREATE DATABASE db2