You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pv...@apache.org on 2018/01/22 10:03:26 UTC
hive git commit: HIVE-18367: Describe Extended output is truncated on
a table with an explicit row format containing tabs or newlines. (Andrew
Sherman via Peter Vary)
Repository: hive
Updated Branches:
refs/heads/master deb3adce6 -> 15dd29451
HIVE-18367: Describe Extended output is truncated on a table with an explicit row format containing tabs or newlines. (Andrew Sherman via Peter Vary)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/15dd2945
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/15dd2945
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/15dd2945
Branch: refs/heads/master
Commit: 15dd29451303bc0028203aee3d144bb6b28be773
Parents: deb3adc
Author: Peter Vary <pv...@cloudera.com>
Authored: Mon Jan 22 11:02:24 2018 +0100
Committer: Peter Vary <pv...@cloudera.com>
Committed: Mon Jan 22 11:02:24 2018 +0100
----------------------------------------------------------------------
.../hive/beeline/TestBeeLineWithArgs.java | 15 +++++++++
.../apache/hive/jdbc/TestJdbcWithMiniHS2.java | 35 ++++++++++++++++++++
.../formatting/TextMetaDataFormatter.java | 3 +-
.../results/clientpositive/create_view.q.out | 34 -------------------
.../create_view_partitioned.q.out | 4 ---
.../test/results/clientpositive/cteViews.q.out | 8 -----
.../llap/cbo_rp_unionDistinct_2.q.out | 34 -------------------
.../clientpositive/llap/subquery_views.q.out | 30 -----------------
.../clientpositive/llap/unionDistinct_2.q.out | 34 -------------------
.../clientpositive/spark/subquery_views.q.out | 30 -----------------
10 files changed, 52 insertions(+), 175 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java b/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
index 75a353d..55c6c23 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
@@ -1130,4 +1130,19 @@ public class TestBeeLineWithArgs {
argList.add("--outputformat=tsv2");
testScriptFile(SCRIPT_TEXT, argList, EXPECTED_PATTERN, true);
}
+
+ /**
+ * Test 'describe extended' on tables that have special white space characters in the row format.
+ */
+ @Test
+ public void testDescribeExtended() throws Throwable {
+ String SCRIPT_TEXT = "drop table if exists describeDelim;"
+ + "create table describeDelim (orderid int, orderdate string, customerid int)"
+ + " ROW FORMAT DELIMITED FIELDS terminated by '\\t' LINES terminated by '\\n';"
+ + "describe extended describeDelim;";
+ List<String> argList = getBaseArgs(miniHS2.getBaseJdbcURL());
+ testScriptFile(SCRIPT_TEXT, argList, OutStream.OUT, Arrays.asList(
+ new Tuple<>("Detailed Table Information.*line.delim=\\\\n", true),
+ new Tuple<>("Detailed Table Information.*field.delim=\\\\t", true)));
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java
index 52ecc1e..8f84cee 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcWithMiniHS2.java
@@ -1617,4 +1617,39 @@ public class TestJdbcWithMiniHS2 {
}
return verticesLists;
}
+
+ /**
+ * Test 'describe extended' on tables that have special white space characters in the row format.
+ */
+ @Test
+ public void testDescribe() throws Exception {
+ try (Statement stmt = conTestDb.createStatement()) {
+ String table = "testDescribe";
+ stmt.execute("drop table if exists " + table);
+ stmt.execute("create table " + table + " (orderid int, orderdate string, customerid int)"
+ + " ROW FORMAT DELIMITED FIELDS terminated by '\\t' LINES terminated by '\\n'");
+ String extendedDescription = getDetailedTableDescription(stmt, table);
+ assertNotNull("could not get Detailed Table Information", extendedDescription);
+ assertTrue("description appears truncated", extendedDescription.endsWith(")"));
+ assertTrue("bad line delimiter", extendedDescription.contains("line.delim=\\n"));
+ assertTrue("bad field delimiter", extendedDescription.contains("field.delim=\\t"));
+ }
+ }
+
+ /**
+ * Get Detailed Table Information via jdbc
+ */
+ private String getDetailedTableDescription(Statement stmt, String table) throws SQLException {
+ String extendedDescription = null;
+ try (ResultSet rs = stmt.executeQuery("describe extended " + table)) {
+ while (rs.next()) {
+ String out = rs.getString(1);
+ String tableInfo = rs.getString(2);
+ if ("Detailed Table Information".equals(out)) { // from TextMetaDataFormatter
+ extendedDescription = tableInfo;
+ }
+ }
+ }
+ return extendedDescription;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
index b743df0..607e111 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
@@ -209,7 +209,8 @@ class TextMetaDataFormatter implements MetaDataFormatter {
// show table information
outStream.write(("Detailed Table Information").getBytes("UTF-8"));
outStream.write(separator);
- outStream.write(tbl.getTTable().toString().getBytes("UTF-8"));
+ String tableDesc = HiveStringUtils.escapeJava(tbl.getTTable().toString());
+ outStream.write(tableDesc.getBytes("UTF-8"));
outStream.write(separator);
outStream.write(terminator);
}
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/ql/src/test/results/clientpositive/create_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view.q.out b/ql/src/test/results/clientpositive/create_view.q.out
index 32532f8..7461523 100644
--- a/ql/src/test/results/clientpositive/create_view.q.out
+++ b/ql/src/test/results/clientpositive/create_view.q.out
@@ -724,8 +724,6 @@ POSTHOOK: Input: default@view8
c string
#### A masked pattern was here ####
-FROM table1, viewExpandedText:SELECT `_c0` AS `c` FROM (SELECT `test_translate`('abc', 'a', 'b')
-FROM `default`.`table1`) `default.view8`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: DESCRIBE FORMATTED view8
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view8
@@ -801,8 +799,6 @@ POSTHOOK: Input: default@view9
m int
#### A masked pattern was here ####
-FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`))
-FROM `default`.`src`) `default.view9`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: DESCRIBE FORMATTED view9
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view9
@@ -878,8 +874,6 @@ POSTHOOK: Input: default@view9
m int
#### A masked pattern was here ####
-FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`))
-FROM `default`.`src`) `default.view9`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: DESCRIBE FORMATTED view9
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view9
@@ -1021,8 +1015,6 @@ POSTHOOK: Input: default@view11
boom int
#### A masked pattern was here ####
-FROM table1, viewExpandedText:SELECT `test_explode`(array(1,2,3)) AS (`boom`)
-FROM `default`.`table1`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: DESCRIBE FORMATTED view11
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view11
@@ -1176,8 +1168,6 @@ POSTHOOK: Input: default@view13
key int
#### A masked pattern was here ####
-FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 ON key) s, viewExpandedText:SELECT `s`.`key`
-FROM `default`.`srcbucket` TABLESAMPLE (BUCKET 1 OUT OF 5 ON `key`) `s`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: DESCRIBE FORMATTED view13
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view13
@@ -1280,24 +1270,6 @@ k2 string
v2 string
#### A masked pattern was here ####
- unionsrc2.key as k2, unionsrc2.value as v2
-FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
- UNION ALL
- select s2.key as key, s2.value as value from src s2 where s2.key < 10) unionsrc1
-JOIN
- (select 'tst1' as key, cast(count(1) as string) as value from src s3
- UNION ALL
- select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2
-ON (unionsrc1.key = unionsrc2.key), viewExpandedText:SELECT `unionsrc1`.`key` as `k1`, `unionsrc1`.`value` as `v1`,
- `unionsrc2`.`key` as `k2`, `unionsrc2`.`value` as `v2`
-FROM (select 'tst1' as `key`, cast(count(1) as string) as `value` from `default`.`src` `s1`
- UNION ALL
- select `s2`.`key` as `key`, `s2`.`value` as `value` from `default`.`src` `s2` where `s2`.`key` < 10) `unionsrc1`
-JOIN
- (select 'tst1' as `key`, cast(count(1) as string) as `value` from `default`.`src` `s3`
- UNION ALL
- select `s4`.`key` as `key`, `s4`.`value` as `value` from `default`.`src` `s4` where `s4`.`key` < 10) `unionsrc2`
-ON (`unionsrc1`.`key` = `unionsrc2`.`key`), tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: DESCRIBE FORMATTED view14
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view14
@@ -1412,10 +1384,6 @@ key string
value_count bigint
#### A masked pattern was here ####
-FROM src
-GROUP BY key, viewExpandedText:SELECT `src`.`key`,COUNT(`src`.`value`) AS `value_count`
-FROM `default`.`src`
-GROUP BY `src`.`key`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: DESCRIBE FORMATTED view15
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view15
@@ -1499,8 +1467,6 @@ POSTHOOK: Input: default@view16
value string
#### A masked pattern was here ####
-FROM src, viewExpandedText:SELECT DISTINCT `src`.`value`
-FROM `default`.`src`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: DESCRIBE FORMATTED view16
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view16
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/ql/src/test/results/clientpositive/create_view_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view_partitioned.q.out b/ql/src/test/results/clientpositive/create_view_partitioned.q.out
index 05af809..2cfb815 100644
--- a/ql/src/test/results/clientpositive/create_view_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/create_view_partitioned.q.out
@@ -45,10 +45,6 @@ value string
value string
#### A masked pattern was here ####
-FROM src
-WHERE key=86, viewExpandedText:SELECT `src`.`key`, `src`.`value`
-FROM `default`.`src`
-WHERE `src`.`key`=86, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: DESCRIBE FORMATTED vp1
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@vp1
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/ql/src/test/results/clientpositive/cteViews.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cteViews.q.out b/ql/src/test/results/clientpositive/cteViews.q.out
index a1920ff..1f1e862 100644
--- a/ql/src/test/results/clientpositive/cteViews.q.out
+++ b/ql/src/test/results/clientpositive/cteViews.q.out
@@ -45,8 +45,6 @@ POSTHOOK: Input: default@v
key string
#### A masked pattern was here ####
-select key from cte, viewExpandedText:with cte as (select `src`.`key`, `src`.`value` from `default`.`src` order by key limit 5)
-select `cte`.`key` from cte, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: create database bug
PREHOOK: type: CREATEDATABASE
PREHOOK: Output: database:bug
@@ -120,8 +118,6 @@ key string
value string
#### A masked pattern was here ####
-select * from cte, viewExpandedText:with cte as (select `src`.`key`, `src`.`value` from `default`.`src` order by `src`.`key` limit 5)
-select `cte`.`key`, `cte`.`value` from cte, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: create database bug
PREHOOK: type: CREATEDATABASE
PREHOOK: Output: database:bug
@@ -193,8 +189,6 @@ POSTHOOK: Input: default@v
key string
#### A masked pattern was here ####
-select * from src1, viewExpandedText:with src1 as (select `src`.`key` from `default`.`src` order by key limit 5)
-select `src1`.`key` from src1, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: create database bug
PREHOOK: type: CREATEDATABASE
PREHOOK: Output: database:bug
@@ -258,8 +252,6 @@ POSTHOOK: Input: default@v
key string
#### A masked pattern was here ####
-select * from src1 a where a.key is not null, viewExpandedText:with src1 as (select `src`.`key` from `default`.`src` order by key limit 5)
-select `a`.`key` from src1 a where `a`.`key` is not null, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@src
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out
index 6b2ca61..6226d14 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out
@@ -350,20 +350,6 @@ key string
value string
#### A masked pattern was here ####
-(
-select distinct * from u1
-union
-select key, value from u2
-union all
-select key as key, value from u3
-) tab, viewExpandedText:select distinct `tab`.`key`, `tab`.`value` from
-(
-select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
-union
-select `u2`.`key`, `u2`.`value` from `default`.`u2`
-union all
-select `u3`.`key` as `key`, `u3`.`value` from `default`.`u3`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -426,16 +412,6 @@ key string
value string
#### A masked pattern was here ####
-(
-select distinct * from u1
-union
-select distinct * from u2
-) tab, viewExpandedText:select `tab`.`key`, `tab`.`value` from
-(
-select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
-union
-select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -493,16 +469,6 @@ key string
value string
#### A masked pattern was here ####
-(
-select distinct u1.* from u1
-union all
-select distinct * from u2
-) tab, viewExpandedText:select `tab`.`key`, `tab`.`value` from
-(
-select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
-union all
-select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/ql/src/test/results/clientpositive/llap/subquery_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_views.q.out b/ql/src/test/results/clientpositive/llap/subquery_views.q.out
index 647412f..3ba7d20 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_views.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_views.q.out
@@ -32,16 +32,6 @@ key string
value string
#### A masked pattern was here ####
-from src b
-where exists
- (select a.key
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_9'), viewExpandedText:select `b`.`key`, `b`.`value`
-from `default`.`src` `b`
-where exists
- (select `a`.`key`
- from `default`.`src` `a`
- where `b`.`value` = `a`.`value` and `a`.`key` = `b`.`key` and `a`.`value` > 'val_9'), tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select *
from cv1 where cv1.key in (select key from cv1 c where c.key > '95')
PREHOOK: type: QUERY
@@ -95,18 +85,6 @@ key string
value string
#### A masked pattern was here ####
-from src b
-where b.key not in
- (select a.key
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_11'
- ), viewExpandedText:select `b`.`key`, `b`.`value`
-from `default`.`src` `b`
-where `b`.`key` not in
- (select `a`.`key`
- from `default`.`src` `a`
- where `b`.`value` = `a`.`value` and `a`.`key` = `b`.`key` and `a`.`value` > 'val_11'
- ), tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: explain
select *
from cv2 where cv2.key in (select key from cv2 c where c.key < '11')
@@ -451,14 +429,6 @@ value string
_c2 bigint
#### A masked pattern was here ####
-from src b
-where b.key in (select key from src where src.key > '8')
-group by key, value
-having count(*) in (select count(*) from src s1 where s1.key > '9' group by s1.key ), viewExpandedText:select `b`.`key`, `b`.`value`, count(*)
-from `default`.`src` `b`
-where `b`.`key` in (select `src`.`key` from `default`.`src` where `src`.`key` > '8')
-group by `b`.`key`, `b`.`value`
-having count(*) in (select count(*) from `default`.`src` `s1` where `s1`.`key` > '9' group by `s1`.`key` ), tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select * from cv3
PREHOOK: type: QUERY
PREHOOK: Input: default@cv3
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out b/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
index a2d827a..789c560 100644
--- a/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
@@ -242,20 +242,6 @@ key string
value string
#### A masked pattern was here ####
-(
-select distinct * from u1
-union
-select key, value from u2
-union all
-select key as key, value from u3
-) tab, viewExpandedText:select distinct `tab`.`key`, `tab`.`value` from
-(
-select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
-union
-select `u2`.`key`, `u2`.`value` from `default`.`u2`
-union all
-select `u3`.`key` as `key`, `u3`.`value` from `default`.`u3`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -318,16 +304,6 @@ key string
value string
#### A masked pattern was here ####
-(
-select distinct * from u1
-union
-select distinct * from u2
-) tab, viewExpandedText:select `tab`.`key`, `tab`.`value` from
-(
-select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
-union
-select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -385,16 +361,6 @@ key string
value string
#### A masked pattern was here ####
-(
-select distinct u1.* from u1
-union all
-select distinct * from u2
-) tab, viewExpandedText:select `tab`.`key`, `tab`.`value` from
-(
-select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
-union all
-select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
http://git-wip-us.apache.org/repos/asf/hive/blob/15dd2945/ql/src/test/results/clientpositive/spark/subquery_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_views.q.out b/ql/src/test/results/clientpositive/spark/subquery_views.q.out
index 8d7df62..815d6bb 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_views.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_views.q.out
@@ -32,16 +32,6 @@ key string
value string
#### A masked pattern was here ####
-from src b
-where exists
- (select a.key
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_9'), viewExpandedText:select `b`.`key`, `b`.`value`
-from `default`.`src` `b`
-where exists
- (select `a`.`key`
- from `default`.`src` `a`
- where `b`.`value` = `a`.`value` and `a`.`key` = `b`.`key` and `a`.`value` > 'val_9'), tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select *
from cv1 where cv1.key in (select key from cv1 c where c.key > '95')
PREHOOK: type: QUERY
@@ -95,18 +85,6 @@ key string
value string
#### A masked pattern was here ####
-from src b
-where b.key not in
- (select a.key
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_11'
- ), viewExpandedText:select `b`.`key`, `b`.`value`
-from `default`.`src` `b`
-where `b`.`key` not in
- (select `a`.`key`
- from `default`.`src` `a`
- where `b`.`value` = `a`.`value` and `a`.`key` = `b`.`key` and `a`.`value` > 'val_11'
- ), tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: explain
select *
from cv2 where cv2.key in (select key from cv2 c where c.key < '11')
@@ -486,14 +464,6 @@ value string
_c2 bigint
#### A masked pattern was here ####
-from src b
-where b.key in (select key from src where src.key > '8')
-group by key, value
-having count(*) in (select count(*) from src s1 where s1.key > '9' group by s1.key ), viewExpandedText:select `b`.`key`, `b`.`value`, count(*)
-from `default`.`src` `b`
-where `b`.`key` in (select `src`.`key` from `default`.`src` where `src`.`key` > '8')
-group by `b`.`key`, `b`.`value`
-having count(*) in (select count(*) from `default`.`src` `s1` where `s1`.`key` > '9' group by `s1`.`key` ), tableType:VIRTUAL_VIEW, rewriteEnabled:false, creationMetadata:{})
PREHOOK: query: select * from cv3
PREHOOK: type: QUERY
PREHOOK: Input: default@cv3