Index: metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java =================================================================== --- metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java (revision 1381793) +++ metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java (working copy) @@ -246,10 +246,10 @@ } assertTrue("Partitions are not same", part.equals(part_get)); - String partName = "ds=2008-07-01 14%3A13%3A12/hr=14"; - String part2Name = "ds=2008-07-01 14%3A13%3A12/hr=15"; - String part3Name ="ds=2008-07-02 14%3A13%3A12/hr=15"; - String part4Name ="ds=2008-07-03 14%3A13%3A12/hr=151"; + String partName = "ds=2008-07-01%2014%3A13%3A12/hr=14"; + String part2Name = "ds=2008-07-01%2014%3A13%3A12/hr=15"; + String part3Name ="ds=2008-07-02%2014%3A13%3A12/hr=15"; + String part4Name ="ds=2008-07-03%2014%3A13%3A12/hr=151"; part_get = client.getPartition(dbName, tblName, partName); assertTrue("Partitions are not the same", part.equals(part_get)); Index: common/src/java/org/apache/hadoop/hive/common/FileUtils.java =================================================================== --- common/src/java/org/apache/hadoop/hive/common/FileUtils.java (revision 1381793) +++ common/src/java/org/apache/hadoop/hive/common/FileUtils.java (working copy) @@ -143,7 +143,7 @@ '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', '\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', '\u001E', '\u001F', '"', '#', '%', '\'', '*', '/', ':', '=', '?', '\\', '\u007F', '{', - '[', ']', '^'}; + '[', ']', '^', ' ','<','>','|'}; for (char c : clist) { charToEscape.set(c); } Index: ql/src/test/results/clientpositive/load_dyn_part14.q.out =================================================================== --- ql/src/test/results/clientpositive/load_dyn_part14.q.out (revision 1381793) +++ ql/src/test/results/clientpositive/load_dyn_part14.q.out (working copy) @@ -282,7 +282,7 @@ ) T POSTHOOK: type: QUERY POSTHOOK: Input: default@src -POSTHOOK: Output: default@nzhang_part14@value= +POSTHOOK: Output: default@nzhang_part14@value=%20 POSTHOOK: Output: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__ POSTHOOK: Lineage: nzhang_part14 PARTITION(value= ).key EXPRESSION [] POSTHOOK: Lineage: nzhang_part14 PARTITION(value=__HIVE_DEFAULT_PARTITION__).key EXPRESSION [] @@ -292,18 +292,18 @@ POSTHOOK: type: SHOWPARTITIONS POSTHOOK: Lineage: nzhang_part14 PARTITION(value= ).key EXPRESSION [] POSTHOOK: Lineage: nzhang_part14 PARTITION(value=__HIVE_DEFAULT_PARTITION__).key EXPRESSION [] -value= +value=%20 value=__HIVE_DEFAULT_PARTITION__ PREHOOK: query: select * from nzhang_part14 where value <> 'a' order by key, value PREHOOK: type: QUERY -PREHOOK: Input: default@nzhang_part14@value= +PREHOOK: Input: default@nzhang_part14@value=%20 PREHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__ #### A masked pattern was here #### POSTHOOK: query: select * from nzhang_part14 where value <> 'a' order by key, value POSTHOOK: type: QUERY -POSTHOOK: Input: default@nzhang_part14@value= +POSTHOOK: Input: default@nzhang_part14@value=%20 POSTHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__ #### A masked pattern was here #### POSTHOOK: Lineage: nzhang_part14 PARTITION(value= ).key EXPRESSION [] Index: ql/src/test/results/clientpositive/escape1.q.out =================================================================== --- ql/src/test/results/clientpositive/escape1.q.out (revision 1381793) +++ ql/src/test/results/clientpositive/escape1.q.out (working copy) @@ -176,7 +176,6 @@ escape_raw POSTHOOK: type: QUERY POSTHOOK: Input: default@escape_raw -POSTHOOK: Output: default@escape1@ds=1/part= POSTHOOK: Output: default@escape1@ds=1/part=! POSTHOOK: Output: default@escape1@ds=1/part=$ POSTHOOK: Output: default@escape1@ds=1/part=%00 @@ -208,6 +207,7 @@ POSTHOOK: Output: default@escape1@ds=1/part=%1D POSTHOOK: Output: default@escape1@ds=1/part=%1E POSTHOOK: Output: default@escape1@ds=1/part=%1F +POSTHOOK: Output: default@escape1@ds=1/part=%20 POSTHOOK: Output: default@escape1@ds=1/part=%22 POSTHOOK: Output: default@escape1@ds=1/part=%23 POSTHOOK: Output: default@escape1@ds=1/part=%25 @@ -215,13 +215,16 @@ POSTHOOK: Output: default@escape1@ds=1/part=%2A POSTHOOK: Output: default@escape1@ds=1/part=%2F POSTHOOK: Output: default@escape1@ds=1/part=%3A +POSTHOOK: Output: default@escape1@ds=1/part=%3C POSTHOOK: Output: default@escape1@ds=1/part=%3D +POSTHOOK: Output: default@escape1@ds=1/part=%3E POSTHOOK: Output: default@escape1@ds=1/part=%3F POSTHOOK: Output: default@escape1@ds=1/part=%5B POSTHOOK: Output: default@escape1@ds=1/part=%5C POSTHOOK: Output: default@escape1@ds=1/part=%5D POSTHOOK: Output: default@escape1@ds=1/part=%5E POSTHOOK: Output: default@escape1@ds=1/part=%7B +POSTHOOK: Output: default@escape1@ds=1/part=%7C POSTHOOK: Output: default@escape1@ds=1/part=& POSTHOOK: Output: default@escape1@ds=1/part=( POSTHOOK: Output: default@escape1@ds=1/part=) @@ -240,8 +243,6 @@ POSTHOOK: Output: default@escape1@ds=1/part=8 POSTHOOK: Output: default@escape1@ds=1/part=9 POSTHOOK: Output: default@escape1@ds=1/part=; -POSTHOOK: Output: default@escape1@ds=1/part=< -POSTHOOK: Output: default@escape1@ds=1/part=> POSTHOOK: Output: default@escape1@ds=1/part=@ POSTHOOK: Output: default@escape1@ds=1/part=A POSTHOOK: Output: default@escape1@ds=1/part=B @@ -298,7 +299,6 @@ POSTHOOK: Output: default@escape1@ds=1/part=x POSTHOOK: Output: default@escape1@ds=1/part=y POSTHOOK: Output: default@escape1@ds=1/part=z -POSTHOOK: Output: default@escape1@ds=1/part=| POSTHOOK: Output: default@escape1@ds=1/part=} POSTHOOK: Output: default@escape1@ds=1/part=~ POSTHOOK: Lineage: escape1 PARTITION(ds=1,part=).a SIMPLE [] @@ -428,7 +428,6 @@ POSTHOOK: Lineage: escape1 PARTITION(ds=1,part=~).a SIMPLE [] PREHOOK: query: SELECT count(*) from escape1 PREHOOK: type: QUERY -PREHOOK: Input: default@escape1@ds=1/part= PREHOOK: Input: default@escape1@ds=1/part=! PREHOOK: Input: default@escape1@ds=1/part=$ PREHOOK: Input: default@escape1@ds=1/part=%00 @@ -460,6 +459,7 @@ PREHOOK: Input: default@escape1@ds=1/part=%1D PREHOOK: Input: default@escape1@ds=1/part=%1E PREHOOK: Input: default@escape1@ds=1/part=%1F +PREHOOK: Input: default@escape1@ds=1/part=%20 PREHOOK: Input: default@escape1@ds=1/part=%22 PREHOOK: Input: default@escape1@ds=1/part=%23 PREHOOK: Input: default@escape1@ds=1/part=%25 @@ -467,13 +467,16 @@ PREHOOK: Input: default@escape1@ds=1/part=%2A PREHOOK: Input: default@escape1@ds=1/part=%2F PREHOOK: Input: default@escape1@ds=1/part=%3A +PREHOOK: Input: default@escape1@ds=1/part=%3C PREHOOK: Input: default@escape1@ds=1/part=%3D +PREHOOK: Input: default@escape1@ds=1/part=%3E PREHOOK: Input: default@escape1@ds=1/part=%3F PREHOOK: Input: default@escape1@ds=1/part=%5B PREHOOK: Input: default@escape1@ds=1/part=%5C PREHOOK: Input: default@escape1@ds=1/part=%5D PREHOOK: Input: default@escape1@ds=1/part=%5E PREHOOK: Input: default@escape1@ds=1/part=%7B +PREHOOK: Input: default@escape1@ds=1/part=%7C PREHOOK: Input: default@escape1@ds=1/part=& PREHOOK: Input: default@escape1@ds=1/part=( PREHOOK: Input: default@escape1@ds=1/part=) @@ -492,8 +495,6 @@ PREHOOK: Input: default@escape1@ds=1/part=8 PREHOOK: Input: default@escape1@ds=1/part=9 PREHOOK: Input: default@escape1@ds=1/part=; -PREHOOK: Input: default@escape1@ds=1/part=< -PREHOOK: Input: default@escape1@ds=1/part=> PREHOOK: Input: default@escape1@ds=1/part=@ PREHOOK: Input: default@escape1@ds=1/part=A PREHOOK: Input: default@escape1@ds=1/part=B @@ -550,13 +551,11 @@ PREHOOK: Input: default@escape1@ds=1/part=x PREHOOK: Input: default@escape1@ds=1/part=y PREHOOK: Input: default@escape1@ds=1/part=z -PREHOOK: Input: default@escape1@ds=1/part=| PREHOOK: Input: default@escape1@ds=1/part=} PREHOOK: Input: default@escape1@ds=1/part=~ #### A masked pattern was here #### POSTHOOK: query: SELECT count(*) from escape1 POSTHOOK: type: QUERY -POSTHOOK: Input: default@escape1@ds=1/part= POSTHOOK: Input: default@escape1@ds=1/part=! POSTHOOK: Input: default@escape1@ds=1/part=$ POSTHOOK: Input: default@escape1@ds=1/part=%00 @@ -588,6 +587,7 @@ POSTHOOK: Input: default@escape1@ds=1/part=%1D POSTHOOK: Input: default@escape1@ds=1/part=%1E POSTHOOK: Input: default@escape1@ds=1/part=%1F +POSTHOOK: Input: default@escape1@ds=1/part=%20 POSTHOOK: Input: default@escape1@ds=1/part=%22 POSTHOOK: Input: default@escape1@ds=1/part=%23 POSTHOOK: Input: default@escape1@ds=1/part=%25 @@ -595,13 +595,16 @@ POSTHOOK: Input: default@escape1@ds=1/part=%2A POSTHOOK: Input: default@escape1@ds=1/part=%2F POSTHOOK: Input: default@escape1@ds=1/part=%3A +POSTHOOK: Input: default@escape1@ds=1/part=%3C POSTHOOK: Input: default@escape1@ds=1/part=%3D +POSTHOOK: Input: default@escape1@ds=1/part=%3E POSTHOOK: Input: default@escape1@ds=1/part=%3F POSTHOOK: Input: default@escape1@ds=1/part=%5B POSTHOOK: Input: default@escape1@ds=1/part=%5C POSTHOOK: Input: default@escape1@ds=1/part=%5D POSTHOOK: Input: default@escape1@ds=1/part=%5E POSTHOOK: Input: default@escape1@ds=1/part=%7B +POSTHOOK: Input: default@escape1@ds=1/part=%7C POSTHOOK: Input: default@escape1@ds=1/part=& POSTHOOK: Input: default@escape1@ds=1/part=( POSTHOOK: Input: default@escape1@ds=1/part=) @@ -620,8 +623,6 @@ POSTHOOK: Input: default@escape1@ds=1/part=8 POSTHOOK: Input: default@escape1@ds=1/part=9 POSTHOOK: Input: default@escape1@ds=1/part=; -POSTHOOK: Input: default@escape1@ds=1/part=< -POSTHOOK: Input: default@escape1@ds=1/part=> POSTHOOK: Input: default@escape1@ds=1/part=@ POSTHOOK: Input: default@escape1@ds=1/part=A POSTHOOK: Input: default@escape1@ds=1/part=B @@ -678,7 +679,6 @@ POSTHOOK: Input: default@escape1@ds=1/part=x POSTHOOK: Input: default@escape1@ds=1/part=y POSTHOOK: Input: default@escape1@ds=1/part=z -POSTHOOK: Input: default@escape1@ds=1/part=| POSTHOOK: Input: default@escape1@ds=1/part=} POSTHOOK: Input: default@escape1@ds=1/part=~ #### A masked pattern was here #### @@ -810,7 +810,6 @@ 128 PREHOOK: query: SELECT * from escape1 PREHOOK: type: QUERY -PREHOOK: Input: default@escape1@ds=1/part= PREHOOK: Input: default@escape1@ds=1/part=! PREHOOK: Input: default@escape1@ds=1/part=$ PREHOOK: Input: default@escape1@ds=1/part=%00 @@ -842,6 +841,7 @@ PREHOOK: Input: default@escape1@ds=1/part=%1D PREHOOK: Input: default@escape1@ds=1/part=%1E PREHOOK: Input: default@escape1@ds=1/part=%1F +PREHOOK: Input: default@escape1@ds=1/part=%20 PREHOOK: Input: default@escape1@ds=1/part=%22 PREHOOK: Input: default@escape1@ds=1/part=%23 PREHOOK: Input: default@escape1@ds=1/part=%25 @@ -849,13 +849,16 @@ PREHOOK: Input: default@escape1@ds=1/part=%2A PREHOOK: Input: default@escape1@ds=1/part=%2F PREHOOK: Input: default@escape1@ds=1/part=%3A +PREHOOK: Input: default@escape1@ds=1/part=%3C PREHOOK: Input: default@escape1@ds=1/part=%3D +PREHOOK: Input: default@escape1@ds=1/part=%3E PREHOOK: Input: default@escape1@ds=1/part=%3F PREHOOK: Input: default@escape1@ds=1/part=%5B PREHOOK: Input: default@escape1@ds=1/part=%5C PREHOOK: Input: default@escape1@ds=1/part=%5D PREHOOK: Input: default@escape1@ds=1/part=%5E PREHOOK: Input: default@escape1@ds=1/part=%7B +PREHOOK: Input: default@escape1@ds=1/part=%7C PREHOOK: Input: default@escape1@ds=1/part=& PREHOOK: Input: default@escape1@ds=1/part=( PREHOOK: Input: default@escape1@ds=1/part=) @@ -874,8 +877,6 @@ PREHOOK: Input: default@escape1@ds=1/part=8 PREHOOK: Input: default@escape1@ds=1/part=9 PREHOOK: Input: default@escape1@ds=1/part=; -PREHOOK: Input: default@escape1@ds=1/part=< -PREHOOK: Input: default@escape1@ds=1/part=> PREHOOK: Input: default@escape1@ds=1/part=@ PREHOOK: Input: default@escape1@ds=1/part=A PREHOOK: Input: default@escape1@ds=1/part=B @@ -932,13 +933,11 @@ PREHOOK: Input: default@escape1@ds=1/part=x PREHOOK: Input: default@escape1@ds=1/part=y PREHOOK: Input: default@escape1@ds=1/part=z -PREHOOK: Input: default@escape1@ds=1/part=| PREHOOK: Input: default@escape1@ds=1/part=} PREHOOK: Input: default@escape1@ds=1/part=~ #### A masked pattern was here #### POSTHOOK: query: SELECT * from escape1 POSTHOOK: type: QUERY -POSTHOOK: Input: default@escape1@ds=1/part= POSTHOOK: Input: default@escape1@ds=1/part=! POSTHOOK: Input: default@escape1@ds=1/part=$ POSTHOOK: Input: default@escape1@ds=1/part=%00 @@ -970,6 +969,7 @@ POSTHOOK: Input: default@escape1@ds=1/part=%1D POSTHOOK: Input: default@escape1@ds=1/part=%1E POSTHOOK: Input: default@escape1@ds=1/part=%1F +POSTHOOK: Input: default@escape1@ds=1/part=%20 POSTHOOK: Input: default@escape1@ds=1/part=%22 POSTHOOK: Input: default@escape1@ds=1/part=%23 POSTHOOK: Input: default@escape1@ds=1/part=%25 @@ -977,13 +977,16 @@ POSTHOOK: Input: default@escape1@ds=1/part=%2A POSTHOOK: Input: default@escape1@ds=1/part=%2F POSTHOOK: Input: default@escape1@ds=1/part=%3A +POSTHOOK: Input: default@escape1@ds=1/part=%3C POSTHOOK: Input: default@escape1@ds=1/part=%3D +POSTHOOK: Input: default@escape1@ds=1/part=%3E POSTHOOK: Input: default@escape1@ds=1/part=%3F POSTHOOK: Input: default@escape1@ds=1/part=%5B POSTHOOK: Input: default@escape1@ds=1/part=%5C POSTHOOK: Input: default@escape1@ds=1/part=%5D POSTHOOK: Input: default@escape1@ds=1/part=%5E POSTHOOK: Input: default@escape1@ds=1/part=%7B +POSTHOOK: Input: default@escape1@ds=1/part=%7C POSTHOOK: Input: default@escape1@ds=1/part=& POSTHOOK: Input: default@escape1@ds=1/part=( POSTHOOK: Input: default@escape1@ds=1/part=) @@ -1002,8 +1005,6 @@ POSTHOOK: Input: default@escape1@ds=1/part=8 POSTHOOK: Input: default@escape1@ds=1/part=9 POSTHOOK: Input: default@escape1@ds=1/part=; -POSTHOOK: Input: default@escape1@ds=1/part=< -POSTHOOK: Input: default@escape1@ds=1/part=> POSTHOOK: Input: default@escape1@ds=1/part=@ POSTHOOK: Input: default@escape1@ds=1/part=A POSTHOOK: Input: default@escape1@ds=1/part=B @@ -1060,7 +1061,6 @@ POSTHOOK: Input: default@escape1@ds=1/part=x POSTHOOK: Input: default@escape1@ds=1/part=y POSTHOOK: Input: default@escape1@ds=1/part=z -POSTHOOK: Input: default@escape1@ds=1/part=| POSTHOOK: Input: default@escape1@ds=1/part=} POSTHOOK: Input: default@escape1@ds=1/part=~ #### A masked pattern was here #### @@ -1189,7 +1189,6 @@ POSTHOOK: Lineage: escape1 PARTITION(ds=1,part=|).a SIMPLE [] POSTHOOK: Lineage: escape1 PARTITION(ds=1,part=}).a SIMPLE [] POSTHOOK: Lineage: escape1 PARTITION(ds=1,part=~).a SIMPLE [] -1 1 1 1 ! 1 1 $ 1 1 @@ -1221,6 +1220,7 @@ 1 1  1 1  1 1  +1 1 1 1 " 1 1 # 1 1 % @@ -1228,13 +1228,16 @@ 1 1 * 1 1 / 1 1 : +1 1 < 1 1 = +1 1 > 1 1 ? 1 1 [ 1 1 \ 1 1 ] 1 1 ^ 1 1 { +1 1 | 1 1 & 1 1 ( 1 1 ) @@ -1253,8 +1256,6 @@ 1 1 8 1 1 9 1 1 ; -1 1 < -1 1 > 1 1 @ 1 1 A 1 1 B @@ -1314,7 +1315,6 @@ 1 1 x 1 1 y 1 1 z -1 1 | 1 1 } 1 1 ~ PREHOOK: query: SHOW PARTITIONS escape1 @@ -1446,7 +1446,6 @@ POSTHOOK: Lineage: escape1 PARTITION(ds=1,part=|).a SIMPLE [] POSTHOOK: Lineage: escape1 PARTITION(ds=1,part=}).a SIMPLE [] POSTHOOK: Lineage: escape1 PARTITION(ds=1,part=~).a SIMPLE [] -ds=1/part= ds=1/part=! ds=1/part=$ ds=1/part=%00 @@ -1478,6 +1477,7 @@ ds=1/part=%1D ds=1/part=%1E ds=1/part=%1F +ds=1/part=%20 ds=1/part=%22 ds=1/part=%23 ds=1/part=%25 @@ -1485,13 +1485,16 @@ ds=1/part=%2A ds=1/part=%2F ds=1/part=%3A +ds=1/part=%3C ds=1/part=%3D +ds=1/part=%3E ds=1/part=%3F ds=1/part=%5B ds=1/part=%5C ds=1/part=%5D ds=1/part=%5E ds=1/part=%7B +ds=1/part=%7C ds=1/part=& ds=1/part=( ds=1/part=) @@ -1510,8 +1513,6 @@ ds=1/part=8 ds=1/part=9 ds=1/part=; -ds=1/part=< -ds=1/part=> ds=1/part=@ ds=1/part=A ds=1/part=B @@ -1568,13 +1569,11 @@ ds=1/part=x ds=1/part=y ds=1/part=z -ds=1/part=| ds=1/part=} ds=1/part=~ PREHOOK: query: ALTER TABLE escape1 DROP PARTITION (ds='1') PREHOOK: type: ALTERTABLE_DROPPARTS PREHOOK: Input: default@escape1 -PREHOOK: Output: default@escape1@ds=1/part= PREHOOK: Output: default@escape1@ds=1/part=! PREHOOK: Output: default@escape1@ds=1/part=$ PREHOOK: Output: default@escape1@ds=1/part=%00 @@ -1606,6 +1605,7 @@ PREHOOK: Output: default@escape1@ds=1/part=%1D PREHOOK: Output: default@escape1@ds=1/part=%1E PREHOOK: Output: default@escape1@ds=1/part=%1F +PREHOOK: Output: default@escape1@ds=1/part=%20 PREHOOK: Output: default@escape1@ds=1/part=%22 PREHOOK: Output: default@escape1@ds=1/part=%23 PREHOOK: Output: default@escape1@ds=1/part=%25 @@ -1613,13 +1613,16 @@ PREHOOK: Output: default@escape1@ds=1/part=%2A PREHOOK: Output: default@escape1@ds=1/part=%2F PREHOOK: Output: default@escape1@ds=1/part=%3A +PREHOOK: Output: default@escape1@ds=1/part=%3C PREHOOK: Output: default@escape1@ds=1/part=%3D +PREHOOK: Output: default@escape1@ds=1/part=%3E PREHOOK: Output: default@escape1@ds=1/part=%3F PREHOOK: Output: default@escape1@ds=1/part=%5B PREHOOK: Output: default@escape1@ds=1/part=%5C PREHOOK: Output: default@escape1@ds=1/part=%5D PREHOOK: Output: default@escape1@ds=1/part=%5E PREHOOK: Output: default@escape1@ds=1/part=%7B +PREHOOK: Output: default@escape1@ds=1/part=%7C PREHOOK: Output: default@escape1@ds=1/part=& PREHOOK: Output: default@escape1@ds=1/part=( PREHOOK: Output: default@escape1@ds=1/part=) @@ -1638,8 +1641,6 @@ PREHOOK: Output: default@escape1@ds=1/part=8 PREHOOK: Output: default@escape1@ds=1/part=9 PREHOOK: Output: default@escape1@ds=1/part=; -PREHOOK: Output: default@escape1@ds=1/part=< -PREHOOK: Output: default@escape1@ds=1/part=> PREHOOK: Output: default@escape1@ds=1/part=@ PREHOOK: Output: default@escape1@ds=1/part=A PREHOOK: Output: default@escape1@ds=1/part=B @@ -1696,13 +1697,11 @@ PREHOOK: Output: default@escape1@ds=1/part=x PREHOOK: Output: default@escape1@ds=1/part=y PREHOOK: Output: default@escape1@ds=1/part=z -PREHOOK: Output: default@escape1@ds=1/part=| PREHOOK: Output: default@escape1@ds=1/part=} PREHOOK: Output: default@escape1@ds=1/part=~ POSTHOOK: query: ALTER TABLE escape1 DROP PARTITION (ds='1') POSTHOOK: type: ALTERTABLE_DROPPARTS POSTHOOK: Input: default@escape1 -POSTHOOK: Output: default@escape1@ds=1/part= POSTHOOK: Output: default@escape1@ds=1/part=! POSTHOOK: Output: default@escape1@ds=1/part=$ POSTHOOK: Output: default@escape1@ds=1/part=%00 @@ -1734,6 +1733,7 @@ POSTHOOK: Output: default@escape1@ds=1/part=%1D POSTHOOK: Output: default@escape1@ds=1/part=%1E POSTHOOK: Output: default@escape1@ds=1/part=%1F +POSTHOOK: Output: default@escape1@ds=1/part=%20 POSTHOOK: Output: default@escape1@ds=1/part=%22 POSTHOOK: Output: default@escape1@ds=1/part=%23 POSTHOOK: Output: default@escape1@ds=1/part=%25 @@ -1741,13 +1741,16 @@ POSTHOOK: Output: default@escape1@ds=1/part=%2A POSTHOOK: Output: default@escape1@ds=1/part=%2F POSTHOOK: Output: default@escape1@ds=1/part=%3A +POSTHOOK: Output: default@escape1@ds=1/part=%3C POSTHOOK: Output: default@escape1@ds=1/part=%3D +POSTHOOK: Output: default@escape1@ds=1/part=%3E POSTHOOK: Output: default@escape1@ds=1/part=%3F POSTHOOK: Output: default@escape1@ds=1/part=%5B POSTHOOK: Output: default@escape1@ds=1/part=%5C POSTHOOK: Output: default@escape1@ds=1/part=%5D POSTHOOK: Output: default@escape1@ds=1/part=%5E POSTHOOK: Output: default@escape1@ds=1/part=%7B +POSTHOOK: Output: default@escape1@ds=1/part=%7C POSTHOOK: Output: default@escape1@ds=1/part=& POSTHOOK: Output: default@escape1@ds=1/part=( POSTHOOK: Output: default@escape1@ds=1/part=) @@ -1766,8 +1769,6 @@ POSTHOOK: Output: default@escape1@ds=1/part=8 POSTHOOK: Output: default@escape1@ds=1/part=9 POSTHOOK: Output: default@escape1@ds=1/part=; -POSTHOOK: Output: default@escape1@ds=1/part=< -POSTHOOK: Output: default@escape1@ds=1/part=> POSTHOOK: Output: default@escape1@ds=1/part=@ POSTHOOK: Output: default@escape1@ds=1/part=A POSTHOOK: Output: default@escape1@ds=1/part=B @@ -1824,7 +1825,6 @@ POSTHOOK: Output: default@escape1@ds=1/part=x POSTHOOK: Output: default@escape1@ds=1/part=y POSTHOOK: Output: default@escape1@ds=1/part=z -POSTHOOK: Output: default@escape1@ds=1/part=| POSTHOOK: Output: default@escape1@ds=1/part=} POSTHOOK: Output: default@escape1@ds=1/part=~ POSTHOOK: Lineage: escape1 PARTITION(ds=1,part=).a SIMPLE [] Index: ql/src/test/results/clientpositive/escape2.q.out =================================================================== --- ql/src/test/results/clientpositive/escape2.q.out (revision 1381793) +++ ql/src/test/results/clientpositive/escape2.q.out (working copy) @@ -176,7 +176,6 @@ escape_raw POSTHOOK: type: QUERY POSTHOOK: Input: default@escape_raw -POSTHOOK: Output: default@escape2@ds=1/part= POSTHOOK: Output: default@escape2@ds=1/part=! POSTHOOK: Output: default@escape2@ds=1/part=$ POSTHOOK: Output: default@escape2@ds=1/part=%00 @@ -208,6 +207,7 @@ POSTHOOK: Output: default@escape2@ds=1/part=%1D POSTHOOK: Output: default@escape2@ds=1/part=%1E POSTHOOK: Output: default@escape2@ds=1/part=%1F +POSTHOOK: Output: default@escape2@ds=1/part=%20 POSTHOOK: Output: default@escape2@ds=1/part=%22 POSTHOOK: Output: default@escape2@ds=1/part=%23 POSTHOOK: Output: default@escape2@ds=1/part=%25 @@ -215,13 +215,16 @@ POSTHOOK: Output: default@escape2@ds=1/part=%2A POSTHOOK: Output: default@escape2@ds=1/part=%2F POSTHOOK: Output: default@escape2@ds=1/part=%3A +POSTHOOK: Output: default@escape2@ds=1/part=%3C POSTHOOK: Output: default@escape2@ds=1/part=%3D +POSTHOOK: Output: default@escape2@ds=1/part=%3E POSTHOOK: Output: default@escape2@ds=1/part=%3F POSTHOOK: Output: default@escape2@ds=1/part=%5B POSTHOOK: Output: default@escape2@ds=1/part=%5C POSTHOOK: Output: default@escape2@ds=1/part=%5D POSTHOOK: Output: default@escape2@ds=1/part=%5E POSTHOOK: Output: default@escape2@ds=1/part=%7B +POSTHOOK: Output: default@escape2@ds=1/part=%7C POSTHOOK: Output: default@escape2@ds=1/part=& POSTHOOK: Output: default@escape2@ds=1/part=( POSTHOOK: Output: default@escape2@ds=1/part=) @@ -240,8 +243,6 @@ POSTHOOK: Output: default@escape2@ds=1/part=8 POSTHOOK: Output: default@escape2@ds=1/part=9 POSTHOOK: Output: default@escape2@ds=1/part=; -POSTHOOK: Output: default@escape2@ds=1/part=< -POSTHOOK: Output: default@escape2@ds=1/part=> POSTHOOK: Output: default@escape2@ds=1/part=@ POSTHOOK: Output: default@escape2@ds=1/part=A POSTHOOK: Output: default@escape2@ds=1/part=B @@ -298,7 +299,6 @@ POSTHOOK: Output: default@escape2@ds=1/part=x POSTHOOK: Output: default@escape2@ds=1/part=y POSTHOOK: Output: default@escape2@ds=1/part=z -POSTHOOK: Output: default@escape2@ds=1/part=| POSTHOOK: Output: default@escape2@ds=1/part=} POSTHOOK: Output: default@escape2@ds=1/part=~ POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] @@ -428,7 +428,6 @@ POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=~).a SIMPLE [] PREHOOK: query: SELECT count(*) from escape2 PREHOOK: type: QUERY -PREHOOK: Input: default@escape2@ds=1/part= PREHOOK: Input: default@escape2@ds=1/part=! PREHOOK: Input: default@escape2@ds=1/part=$ PREHOOK: Input: default@escape2@ds=1/part=%00 @@ -460,6 +459,7 @@ PREHOOK: Input: default@escape2@ds=1/part=%1D PREHOOK: Input: default@escape2@ds=1/part=%1E PREHOOK: Input: default@escape2@ds=1/part=%1F +PREHOOK: Input: default@escape2@ds=1/part=%20 PREHOOK: Input: default@escape2@ds=1/part=%22 PREHOOK: Input: default@escape2@ds=1/part=%23 PREHOOK: Input: default@escape2@ds=1/part=%25 @@ -467,13 +467,16 @@ PREHOOK: Input: default@escape2@ds=1/part=%2A PREHOOK: Input: default@escape2@ds=1/part=%2F PREHOOK: Input: default@escape2@ds=1/part=%3A +PREHOOK: Input: default@escape2@ds=1/part=%3C PREHOOK: Input: default@escape2@ds=1/part=%3D +PREHOOK: Input: default@escape2@ds=1/part=%3E PREHOOK: Input: default@escape2@ds=1/part=%3F PREHOOK: Input: default@escape2@ds=1/part=%5B PREHOOK: Input: default@escape2@ds=1/part=%5C PREHOOK: Input: default@escape2@ds=1/part=%5D PREHOOK: Input: default@escape2@ds=1/part=%5E PREHOOK: Input: default@escape2@ds=1/part=%7B +PREHOOK: Input: default@escape2@ds=1/part=%7C PREHOOK: Input: default@escape2@ds=1/part=& PREHOOK: Input: default@escape2@ds=1/part=( PREHOOK: Input: default@escape2@ds=1/part=) @@ -492,8 +495,6 @@ PREHOOK: Input: default@escape2@ds=1/part=8 PREHOOK: Input: default@escape2@ds=1/part=9 PREHOOK: Input: default@escape2@ds=1/part=; -PREHOOK: Input: default@escape2@ds=1/part=< -PREHOOK: Input: default@escape2@ds=1/part=> PREHOOK: Input: default@escape2@ds=1/part=@ PREHOOK: Input: default@escape2@ds=1/part=A PREHOOK: Input: default@escape2@ds=1/part=B @@ -550,13 +551,11 @@ PREHOOK: Input: default@escape2@ds=1/part=x PREHOOK: Input: default@escape2@ds=1/part=y PREHOOK: Input: default@escape2@ds=1/part=z -PREHOOK: Input: default@escape2@ds=1/part=| PREHOOK: Input: default@escape2@ds=1/part=} PREHOOK: Input: default@escape2@ds=1/part=~ #### A masked pattern was here #### POSTHOOK: query: SELECT count(*) from escape2 POSTHOOK: type: QUERY -POSTHOOK: Input: default@escape2@ds=1/part= POSTHOOK: Input: default@escape2@ds=1/part=! POSTHOOK: Input: default@escape2@ds=1/part=$ POSTHOOK: Input: default@escape2@ds=1/part=%00 @@ -588,6 +587,7 @@ POSTHOOK: Input: default@escape2@ds=1/part=%1D POSTHOOK: Input: default@escape2@ds=1/part=%1E POSTHOOK: Input: default@escape2@ds=1/part=%1F +POSTHOOK: Input: default@escape2@ds=1/part=%20 POSTHOOK: Input: default@escape2@ds=1/part=%22 POSTHOOK: Input: default@escape2@ds=1/part=%23 POSTHOOK: Input: default@escape2@ds=1/part=%25 @@ -595,13 +595,16 @@ POSTHOOK: Input: default@escape2@ds=1/part=%2A POSTHOOK: Input: default@escape2@ds=1/part=%2F POSTHOOK: Input: default@escape2@ds=1/part=%3A +POSTHOOK: Input: default@escape2@ds=1/part=%3C POSTHOOK: Input: default@escape2@ds=1/part=%3D +POSTHOOK: Input: default@escape2@ds=1/part=%3E POSTHOOK: Input: default@escape2@ds=1/part=%3F POSTHOOK: Input: default@escape2@ds=1/part=%5B POSTHOOK: Input: default@escape2@ds=1/part=%5C POSTHOOK: Input: default@escape2@ds=1/part=%5D POSTHOOK: Input: default@escape2@ds=1/part=%5E POSTHOOK: Input: default@escape2@ds=1/part=%7B +POSTHOOK: Input: default@escape2@ds=1/part=%7C POSTHOOK: Input: default@escape2@ds=1/part=& POSTHOOK: Input: default@escape2@ds=1/part=( POSTHOOK: Input: default@escape2@ds=1/part=) @@ -620,8 +623,6 @@ POSTHOOK: Input: default@escape2@ds=1/part=8 POSTHOOK: Input: default@escape2@ds=1/part=9 POSTHOOK: Input: default@escape2@ds=1/part=; -POSTHOOK: Input: default@escape2@ds=1/part=< -POSTHOOK: Input: default@escape2@ds=1/part=> POSTHOOK: Input: default@escape2@ds=1/part=@ POSTHOOK: Input: default@escape2@ds=1/part=A POSTHOOK: Input: default@escape2@ds=1/part=B @@ -678,7 +679,6 @@ POSTHOOK: Input: default@escape2@ds=1/part=x POSTHOOK: Input: default@escape2@ds=1/part=y POSTHOOK: Input: default@escape2@ds=1/part=z -POSTHOOK: Input: default@escape2@ds=1/part=| POSTHOOK: Input: default@escape2@ds=1/part=} POSTHOOK: Input: default@escape2@ds=1/part=~ #### A masked pattern was here #### @@ -810,7 +810,6 @@ 128 PREHOOK: query: SELECT * from escape2 PREHOOK: type: QUERY -PREHOOK: Input: default@escape2@ds=1/part= PREHOOK: Input: default@escape2@ds=1/part=! PREHOOK: Input: default@escape2@ds=1/part=$ PREHOOK: Input: default@escape2@ds=1/part=%00 @@ -842,6 +841,7 @@ PREHOOK: Input: default@escape2@ds=1/part=%1D PREHOOK: Input: default@escape2@ds=1/part=%1E PREHOOK: Input: default@escape2@ds=1/part=%1F +PREHOOK: Input: default@escape2@ds=1/part=%20 PREHOOK: Input: default@escape2@ds=1/part=%22 PREHOOK: Input: default@escape2@ds=1/part=%23 PREHOOK: Input: default@escape2@ds=1/part=%25 @@ -849,13 +849,16 @@ PREHOOK: Input: default@escape2@ds=1/part=%2A PREHOOK: Input: default@escape2@ds=1/part=%2F PREHOOK: Input: default@escape2@ds=1/part=%3A +PREHOOK: Input: default@escape2@ds=1/part=%3C PREHOOK: Input: default@escape2@ds=1/part=%3D +PREHOOK: Input: default@escape2@ds=1/part=%3E PREHOOK: Input: default@escape2@ds=1/part=%3F PREHOOK: Input: default@escape2@ds=1/part=%5B PREHOOK: Input: default@escape2@ds=1/part=%5C PREHOOK: Input: default@escape2@ds=1/part=%5D PREHOOK: Input: default@escape2@ds=1/part=%5E PREHOOK: Input: default@escape2@ds=1/part=%7B +PREHOOK: Input: default@escape2@ds=1/part=%7C PREHOOK: Input: default@escape2@ds=1/part=& PREHOOK: Input: default@escape2@ds=1/part=( PREHOOK: Input: default@escape2@ds=1/part=) @@ -874,8 +877,6 @@ PREHOOK: Input: default@escape2@ds=1/part=8 PREHOOK: Input: default@escape2@ds=1/part=9 PREHOOK: Input: default@escape2@ds=1/part=; -PREHOOK: Input: default@escape2@ds=1/part=< -PREHOOK: Input: default@escape2@ds=1/part=> PREHOOK: Input: default@escape2@ds=1/part=@ PREHOOK: Input: default@escape2@ds=1/part=A PREHOOK: Input: default@escape2@ds=1/part=B @@ -932,13 +933,11 @@ PREHOOK: Input: default@escape2@ds=1/part=x PREHOOK: Input: default@escape2@ds=1/part=y PREHOOK: Input: default@escape2@ds=1/part=z -PREHOOK: Input: default@escape2@ds=1/part=| PREHOOK: Input: default@escape2@ds=1/part=} PREHOOK: Input: default@escape2@ds=1/part=~ #### A masked pattern was here #### POSTHOOK: query: SELECT * from escape2 POSTHOOK: type: QUERY -POSTHOOK: Input: default@escape2@ds=1/part= POSTHOOK: Input: default@escape2@ds=1/part=! POSTHOOK: Input: default@escape2@ds=1/part=$ POSTHOOK: Input: default@escape2@ds=1/part=%00 @@ -970,6 +969,7 @@ POSTHOOK: Input: default@escape2@ds=1/part=%1D POSTHOOK: Input: default@escape2@ds=1/part=%1E POSTHOOK: Input: default@escape2@ds=1/part=%1F +POSTHOOK: Input: default@escape2@ds=1/part=%20 POSTHOOK: Input: default@escape2@ds=1/part=%22 POSTHOOK: Input: default@escape2@ds=1/part=%23 POSTHOOK: Input: default@escape2@ds=1/part=%25 @@ -977,13 +977,16 @@ POSTHOOK: Input: default@escape2@ds=1/part=%2A POSTHOOK: Input: default@escape2@ds=1/part=%2F POSTHOOK: Input: default@escape2@ds=1/part=%3A +POSTHOOK: Input: default@escape2@ds=1/part=%3C POSTHOOK: Input: default@escape2@ds=1/part=%3D +POSTHOOK: Input: default@escape2@ds=1/part=%3E POSTHOOK: Input: default@escape2@ds=1/part=%3F POSTHOOK: Input: default@escape2@ds=1/part=%5B POSTHOOK: Input: default@escape2@ds=1/part=%5C POSTHOOK: Input: default@escape2@ds=1/part=%5D POSTHOOK: Input: default@escape2@ds=1/part=%5E POSTHOOK: Input: default@escape2@ds=1/part=%7B +POSTHOOK: Input: default@escape2@ds=1/part=%7C POSTHOOK: Input: default@escape2@ds=1/part=& POSTHOOK: Input: default@escape2@ds=1/part=( POSTHOOK: Input: default@escape2@ds=1/part=) @@ -1002,8 +1005,6 @@ POSTHOOK: Input: default@escape2@ds=1/part=8 POSTHOOK: Input: default@escape2@ds=1/part=9 POSTHOOK: Input: default@escape2@ds=1/part=; -POSTHOOK: Input: default@escape2@ds=1/part=< -POSTHOOK: Input: default@escape2@ds=1/part=> POSTHOOK: Input: default@escape2@ds=1/part=@ POSTHOOK: Input: default@escape2@ds=1/part=A POSTHOOK: Input: default@escape2@ds=1/part=B @@ -1060,7 +1061,6 @@ POSTHOOK: Input: default@escape2@ds=1/part=x POSTHOOK: Input: default@escape2@ds=1/part=y POSTHOOK: Input: default@escape2@ds=1/part=z -POSTHOOK: Input: default@escape2@ds=1/part=| POSTHOOK: Input: default@escape2@ds=1/part=} POSTHOOK: Input: default@escape2@ds=1/part=~ #### A masked pattern was here #### @@ -1189,7 +1189,6 @@ POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=|).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=}).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=~).a SIMPLE [] -1 1 1 1 ! 1 1 $ 1 1 @@ -1221,6 +1220,7 @@ 1 1  1 1  1 1  +1 1 1 1 " 1 1 # 1 1 % @@ -1228,13 +1228,16 @@ 1 1 * 1 1 / 1 1 : +1 1 < 1 1 = +1 1 > 1 1 ? 1 1 [ 1 1 \ 1 1 ] 1 1 ^ 1 1 { +1 1 | 1 1 & 1 1 ( 1 1 ) @@ -1253,8 +1256,6 @@ 1 1 8 1 1 9 1 1 ; -1 1 < -1 1 > 1 1 @ 1 1 A 1 1 B @@ -1314,7 +1315,6 @@ 1 1 x 1 1 y 1 1 z -1 1 | 1 1 } 1 1 ~ PREHOOK: query: SHOW PARTITIONS escape2 @@ -1446,7 +1446,6 @@ POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=|).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=}).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=~).a SIMPLE [] -ds=1/part= ds=1/part=! ds=1/part=$ ds=1/part=%00 @@ -1478,6 +1477,7 @@ ds=1/part=%1D ds=1/part=%1E ds=1/part=%1F +ds=1/part=%20 ds=1/part=%22 ds=1/part=%23 ds=1/part=%25 @@ -1485,13 +1485,16 @@ ds=1/part=%2A ds=1/part=%2F ds=1/part=%3A +ds=1/part=%3C ds=1/part=%3D +ds=1/part=%3E ds=1/part=%3F ds=1/part=%5B ds=1/part=%5C ds=1/part=%5D ds=1/part=%5E ds=1/part=%7B +ds=1/part=%7C ds=1/part=& ds=1/part=( ds=1/part=) @@ -1510,8 +1513,6 @@ ds=1/part=8 ds=1/part=9 ds=1/part=; -ds=1/part=< -ds=1/part=> ds=1/part=@ ds=1/part=A ds=1/part=B @@ -1568,7 +1569,6 @@ ds=1/part=x ds=1/part=y ds=1/part=z -ds=1/part=| ds=1/part=} ds=1/part=~ PREHOOK: query: -- ASCII values 1-31, 59, 92, 127 were not included in the below commands @@ -1576,13 +1576,13 @@ ALTER table escape2 PARTITION (ds='1', part=' ') CONCATENATE PREHOOK: type: ALTER_PARTITION_MERGE PREHOOK: Input: default@escape2 -PREHOOK: Output: default@escape2@ds=1/part= +PREHOOK: Output: default@escape2@ds=1/part=%20 POSTHOOK: query: -- ASCII values 1-31, 59, 92, 127 were not included in the below commands ALTER table escape2 PARTITION (ds='1', part=' ') CONCATENATE POSTHOOK: type: ALTER_PARTITION_MERGE POSTHOOK: Input: default@escape2 -POSTHOOK: Output: default@escape2@ds=1/part= +POSTHOOK: Output: default@escape2@ds=1/part=%20 POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] @@ -5169,11 +5169,11 @@ PREHOOK: query: ALTER TABLE escape2 PARTITION (ds='1', part='<') CONCATENATE PREHOOK: type: ALTER_PARTITION_MERGE PREHOOK: Input: default@escape2 -PREHOOK: Output: default@escape2@ds=1/part=< +PREHOOK: Output: default@escape2@ds=1/part=%3C POSTHOOK: query: ALTER TABLE escape2 PARTITION (ds='1', part='<') CONCATENATE POSTHOOK: type: ALTER_PARTITION_MERGE POSTHOOK: Input: default@escape2 -POSTHOOK: Output: default@escape2@ds=1/part=< +POSTHOOK: Output: default@escape2@ds=1/part=%3C POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] @@ -5435,11 +5435,11 @@ PREHOOK: query: ALTER TABLE escape2 PARTITION (ds='1', part='>') CONCATENATE PREHOOK: type: ALTER_PARTITION_MERGE PREHOOK: Input: default@escape2 -PREHOOK: Output: default@escape2@ds=1/part=> +PREHOOK: Output: default@escape2@ds=1/part=%3E POSTHOOK: query: ALTER TABLE escape2 PARTITION (ds='1', part='>') CONCATENATE POSTHOOK: type: ALTER_PARTITION_MERGE POSTHOOK: Input: default@escape2 -POSTHOOK: Output: default@escape2@ds=1/part=> +POSTHOOK: Output: default@escape2@ds=1/part=%3E POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] @@ -13415,11 +13415,11 @@ PREHOOK: query: ALTER TABLE escape2 PARTITION (ds='1', part='|') CONCATENATE PREHOOK: type: ALTER_PARTITION_MERGE PREHOOK: Input: default@escape2 -PREHOOK: Output: default@escape2@ds=1/part=| +PREHOOK: Output: default@escape2@ds=1/part=%7C POSTHOOK: query: ALTER TABLE escape2 PARTITION (ds='1', part='|') CONCATENATE POSTHOOK: type: ALTER_PARTITION_MERGE POSTHOOK: Input: default@escape2 -POSTHOOK: Output: default@escape2@ds=1/part=| +POSTHOOK: Output: default@escape2@ds=1/part=%7C POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] POSTHOOK: Lineage: escape2 PARTITION(ds=1,part=).a SIMPLE [] Index: ql/src/test/results/clientpositive/input_part10.q.out =================================================================== --- ql/src/test/results/clientpositive/input_part10.q.out (revision 1381793) +++ ql/src/test/results/clientpositive/input_part10.q.out (working copy) @@ -87,12 +87,12 @@ SELECT 1, 2 FROM src LIMIT 1 PREHOOK: type: QUERY PREHOOK: Input: default@src -PREHOOK: Output: default@part_special@ds=2008 04 08/ts=10%3A11%3A12%3D455 +PREHOOK: Output: default@part_special@ds=2008%2004%2008/ts=10%3A11%3A12%3D455 POSTHOOK: query: INSERT OVERWRITE TABLE part_special PARTITION(ds='2008 04 08', ts = '10:11:12=455') SELECT 1, 2 FROM src LIMIT 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src -POSTHOOK: Output: default@part_special@ds=2008 04 08/ts=10%3A11%3A12%3D455 +POSTHOOK: Output: default@part_special@ds=2008%2004%2008/ts=10%3A11%3A12%3D455 POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).a SIMPLE [] POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).b SIMPLE [] PREHOOK: query: DESCRIBE EXTENDED part_special PARTITION(ds='2008 04 08', ts = '10:11:12=455') @@ -109,11 +109,11 @@ #### A masked pattern was here #### PREHOOK: query: SELECT * FROM part_special WHERE ds='2008 04 08' AND ts = '10:11:12=455' PREHOOK: type: QUERY -PREHOOK: Input: default@part_special@ds=2008 04 08/ts=10%3A11%3A12%3D455 +PREHOOK: Input: default@part_special@ds=2008%2004%2008/ts=10%3A11%3A12%3D455 #### A masked pattern was here #### POSTHOOK: query: SELECT * FROM part_special WHERE ds='2008 04 08' AND ts = '10:11:12=455' POSTHOOK: type: QUERY -POSTHOOK: Input: default@part_special@ds=2008 04 08/ts=10%3A11%3A12%3D455 +POSTHOOK: Input: default@part_special@ds=2008%2004%2008/ts=10%3A11%3A12%3D455 #### A masked pattern was here #### POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).a SIMPLE [] POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).b SIMPLE [] Index: ql/src/test/results/clientpositive/combine2.q.out =================================================================== --- ql/src/test/results/clientpositive/combine2.q.out (revision 1381793) +++ ql/src/test/results/clientpositive/combine2.q.out (working copy) @@ -42,14 +42,14 @@ select key, '2010-04-21 09:45:00' value from src where key = 19) s POSTHOOK: type: QUERY POSTHOOK: Input: default@src -POSTHOOK: Output: default@combine2@value=2010-04-21 09%3A45%3A00 +POSTHOOK: Output: default@combine2@value=%7C +POSTHOOK: Output: default@combine2@value=2010-04-21%2009%3A45%3A00 POSTHOOK: Output: default@combine2@value=val_0 POSTHOOK: Output: default@combine2@value=val_2 POSTHOOK: Output: default@combine2@value=val_4 POSTHOOK: Output: default@combine2@value=val_5 POSTHOOK: Output: default@combine2@value=val_8 POSTHOOK: Output: default@combine2@value=val_9 -POSTHOOK: Output: default@combine2@value=| POSTHOOK: Lineage: combine2 PARTITION(value=2010-04-21 09:45:00).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine2 PARTITION(value=val_0).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine2 PARTITION(value=val_2).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -70,14 +70,14 @@ POSTHOOK: Lineage: combine2 PARTITION(value=val_8).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine2 PARTITION(value=val_9).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine2 PARTITION(value=|).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ] -value=2010-04-21 09%3A45%3A00 +value=%7C +value=2010-04-21%2009%3A45%3A00 value=val_0 value=val_2 value=val_4 value=val_5 value=val_8 value=val_9 -value=| PREHOOK: query: explain select key, value from combine2 where value is not null order by key PREHOOK: type: QUERY @@ -140,25 +140,25 @@ PREHOOK: query: select key, value from combine2 where value is not null order by key PREHOOK: type: QUERY -PREHOOK: Input: default@combine2@value=2010-04-21 09%3A45%3A00 +PREHOOK: Input: default@combine2@value=%7C +PREHOOK: Input: default@combine2@value=2010-04-21%2009%3A45%3A00 PREHOOK: Input: default@combine2@value=val_0 PREHOOK: Input: default@combine2@value=val_2 PREHOOK: Input: default@combine2@value=val_4 PREHOOK: Input: default@combine2@value=val_5 PREHOOK: Input: default@combine2@value=val_8 PREHOOK: Input: default@combine2@value=val_9 -PREHOOK: Input: default@combine2@value=| #### A masked pattern was here #### POSTHOOK: query: select key, value from combine2 where value is not null order by key POSTHOOK: type: QUERY -POSTHOOK: Input: default@combine2@value=2010-04-21 09%3A45%3A00 +POSTHOOK: Input: default@combine2@value=%7C +POSTHOOK: Input: default@combine2@value=2010-04-21%2009%3A45%3A00 POSTHOOK: Input: default@combine2@value=val_0 POSTHOOK: Input: default@combine2@value=val_2 POSTHOOK: Input: default@combine2@value=val_4 POSTHOOK: Input: default@combine2@value=val_5 POSTHOOK: Input: default@combine2@value=val_8 POSTHOOK: Input: default@combine2@value=val_9 -POSTHOOK: Input: default@combine2@value=| #### A masked pattern was here #### POSTHOOK: Lineage: combine2 PARTITION(value=2010-04-21 09:45:00).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine2 PARTITION(value=val_0).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -228,11 +228,11 @@ Path -> Partition: #### A masked pattern was here #### Partition - base file name: value=2010-04-21 09%3A45%3A00 + base file name: value=%7C input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: - value 2010-04-21 09:45:00 + value | properties: bucket_count -1 columns key @@ -274,11 +274,11 @@ name: default.combine2 #### A masked pattern was here #### Partition - base file name: value=val_0 + base file name: value=2010-04-21%2009%3A45%3A00 input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: - value val_0 + value 2010-04-21 09:45:00 properties: bucket_count -1 columns key @@ -287,13 +287,13 @@ name default.combine2 numFiles 1 numPartitions 8 - numRows 3 + numRows 1 partition_columns value - rawDataSize 3 + rawDataSize 2 serialization.ddl struct combine2 { string key} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - totalSize 6 + totalSize 3 #### A masked pattern was here #### serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -320,11 +320,11 @@ name: default.combine2 #### A masked pattern was here #### Partition - base file name: value=val_2 + base file name: value=val_0 input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: - value val_2 + value val_0 properties: bucket_count -1 columns key @@ -333,13 +333,13 @@ name default.combine2 numFiles 1 numPartitions 8 - numRows 1 + numRows 3 partition_columns value - rawDataSize 1 + rawDataSize 3 serialization.ddl struct combine2 { string key} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - totalSize 2 + totalSize 6 #### A masked pattern was here #### serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -366,11 +366,11 @@ name: default.combine2 #### A masked pattern was here #### Partition - base file name: value=val_4 + base file name: value=val_2 input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: - value val_4 + value val_2 properties: bucket_count -1 columns key @@ -412,11 +412,11 @@ name: default.combine2 #### A masked pattern was here #### Partition - base file name: value=val_5 + base file name: value=val_4 input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: - value val_5 + value val_4 properties: bucket_count -1 columns key @@ -425,13 +425,13 @@ name default.combine2 numFiles 1 numPartitions 8 - numRows 3 + numRows 1 partition_columns value - rawDataSize 3 + rawDataSize 1 serialization.ddl struct combine2 { string key} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - totalSize 6 + totalSize 2 #### A masked pattern was here #### serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -458,11 +458,11 @@ name: default.combine2 #### A masked pattern was here #### Partition - base file name: value=val_8 + base file name: value=val_5 input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: - value val_8 + value val_5 properties: bucket_count -1 columns key @@ -471,13 +471,13 @@ name default.combine2 numFiles 1 numPartitions 8 - numRows 1 + numRows 3 partition_columns value - rawDataSize 1 + rawDataSize 3 serialization.ddl struct combine2 { string key} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - totalSize 2 + totalSize 6 #### A masked pattern was here #### serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -504,11 +504,11 @@ name: default.combine2 #### A masked pattern was here #### Partition - base file name: value=val_9 + base file name: value=val_8 input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: - value val_9 + value val_8 properties: bucket_count -1 columns key @@ -550,11 +550,11 @@ name: default.combine2 #### A masked pattern was here #### Partition - base file name: value=| + base file name: value=val_9 input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat partition values: - value | + value val_9 properties: bucket_count -1 columns key @@ -565,11 +565,11 @@ numPartitions 8 numRows 1 partition_columns value - rawDataSize 2 + rawDataSize 1 serialization.ddl struct combine2 { string key} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - totalSize 3 + totalSize 2 #### A masked pattern was here #### serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -631,25 +631,25 @@ PREHOOK: query: select count(1) from combine2 where value is not null PREHOOK: type: QUERY -PREHOOK: Input: default@combine2@value=2010-04-21 09%3A45%3A00 +PREHOOK: Input: default@combine2@value=%7C +PREHOOK: Input: default@combine2@value=2010-04-21%2009%3A45%3A00 PREHOOK: Input: default@combine2@value=val_0 PREHOOK: Input: default@combine2@value=val_2 PREHOOK: Input: default@combine2@value=val_4 PREHOOK: Input: default@combine2@value=val_5 PREHOOK: Input: default@combine2@value=val_8 PREHOOK: Input: default@combine2@value=val_9 -PREHOOK: Input: default@combine2@value=| #### A masked pattern was here #### POSTHOOK: query: select count(1) from combine2 where value is not null POSTHOOK: type: QUERY -POSTHOOK: Input: default@combine2@value=2010-04-21 09%3A45%3A00 +POSTHOOK: Input: default@combine2@value=%7C +POSTHOOK: Input: default@combine2@value=2010-04-21%2009%3A45%3A00 POSTHOOK: Input: default@combine2@value=val_0 POSTHOOK: Input: default@combine2@value=val_2 POSTHOOK: Input: default@combine2@value=val_4 POSTHOOK: Input: default@combine2@value=val_5 POSTHOOK: Input: default@combine2@value=val_8 POSTHOOK: Input: default@combine2@value=val_9 -POSTHOOK: Input: default@combine2@value=| #### A masked pattern was here #### POSTHOOK: Lineage: combine2 PARTITION(value=2010-04-21 09:45:00).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine2 PARTITION(value=val_0).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:key, type:string, comment:default), ]