diff --git a/common/src/java/org/apache/hadoop/hive/common/FileUtils.java b/common/src/java/org/apache/hadoop/hive/common/FileUtils.java index c1f8842..c3a2cd4 100644 --- a/common/src/java/org/apache/hadoop/hive/common/FileUtils.java +++ b/common/src/java/org/apache/hadoop/hive/common/FileUtils.java @@ -20,13 +20,21 @@ import java.io.IOException; import java.net.URI; +import java.net.URISyntaxException; import java.util.BitSet; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.permission.FsAction; +import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.Shell; @@ -34,7 +42,7 @@ * Collection of file manipulation utilities common across Hive. */ public final class FileUtils { - + private static final Log LOG = LogFactory.getLog(FileUtils.class.getName()); /** * Variant of Path.makeQualified that qualifies the input path against the default file system * indicated by the configuration @@ -297,4 +305,134 @@ public static void listStatusRecursively(FileSystem fs, FileStatus fileStatus, } } + /** + * Find the parent of path that exists, if path does not exist + * + * @param fs + * file system + * @param path + * @return the argument path if it exists or a parent path exists. Returns + * NULL root is only parent that exists + * @throws IOException + */ + public static Path getPathOrParentThatExists(FileSystem fs, Path path) throws IOException { + if (!fs.exists(path)) { + Path parentPath = path.getParent(); + return getPathOrParentThatExists(fs, parentPath); + } + return path; + } + + /** + * Check if the given FileStatus indicates that the action is allowed for + * userName. It checks the group and other permissions also to determine this. + * + * @param userName + * @param fsStatus + * @param action + * @return true if it is writable for userName + */ + public static boolean isActionPermittedForUser(String userName, FileStatus fsStatus, FsAction action) { + FsPermission permissions = fsStatus.getPermission(); + // check user perm + if (fsStatus.getOwner().equals(userName) + && permissions.getUserAction().implies(action)) { + return true; + } + // check other perm + if (permissions.getOtherAction().implies(action)) { + return true; + } + // check group perm after ensuring user belongs to the file owner group + String fileGroup = fsStatus.getGroup(); + String[] userGroups = UserGroupInformation.createRemoteUser(userName).getGroupNames(); + for (String group : userGroups) { + if (group.equals(fileGroup)) { + // user belongs to the file group + return permissions.getGroupAction().implies(action); + } + } + return false; + } + + /** + * Check if user userName has permissions to perform the given FsAction action + * on all files under the file whose FileStatus fileStatus is provided + * + * @param fs + * @param fileStatus + * @param userName + * @param action + * @return + * @throws IOException + */ + public static boolean isActionPermittedForFileHierarchy(FileSystem fs, FileStatus fileStatus, + String userName, FsAction action) throws IOException { + boolean isDir = fileStatus.isDir(); + + FsAction dirActionNeeded = action; + if (isDir) { + // for dirs user needs execute privileges as well + dirActionNeeded.and(FsAction.EXECUTE); + } + if (!isActionPermittedForUser(userName, fileStatus, dirActionNeeded)) { + return false; + } + + if (!isDir) { + // no sub dirs to be checked + return true; + } + // check all children + FileStatus[] childStatuses = fs.listStatus(fileStatus.getPath()); + for (FileStatus childStatus : childStatuses) { + // check children recursively + if (!isActionPermittedForFileHierarchy(fs, childStatus, userName, action)) { + return false; + } + } + return true; + } + + /** + * A best effort attempt to determine if if the file is a local file + * @param conf + * @param fileName + * @return true if it was successfully able to determine that it is a local file + */ + public static boolean isLocalFile(HiveConf conf, String fileName) { + try { + // do best effor to determine if this is a local file + FileSystem fsForFile = FileSystem.get(new URI(fileName), conf); + return LocalFileSystem.class.isInstance(fsForFile); + } catch (URISyntaxException e) { + LOG.warn("Unable to create URI from " + fileName, e); + } catch (IOException e) { + LOG.warn("Unable to get FileSystem for " + fileName, e); + } + return false; + } + + public static boolean isOwnerOfFileHierarchy(FileSystem fs, FileStatus fileStatus, String userName) + throws IOException { + if (!fileStatus.getOwner().equals(userName)) { + return false; + } + + if (!fileStatus.isDir()) { + // no sub dirs to be checked + return true; + } + // check all children + FileStatus[] childStatuses = fs.listStatus(fileStatus.getPath()); + for (FileStatus childStatus : childStatuses) { + // check children recursively + if (!isOwnerOfFileHierarchy(fs, childStatus, userName)) { + return false; + } + } + return true; + } + + } diff --git a/contrib/src/test/results/clientnegative/serde_regex.q.out b/contrib/src/test/results/clientnegative/serde_regex.q.out index 580b623..8078b2c 100644 --- a/contrib/src/test/results/clientnegative/serde_regex.q.out +++ b/contrib/src/test/results/clientnegative/serde_regex.q.out @@ -73,4 +73,5 @@ WITH SERDEPROPERTIES ( ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. java.lang.RuntimeException: MetaException(message:org.apache.hadoop.hive.serde2.SerDeException org.apache.hadoop.hive.contrib.serde2.RegexSerDe only accepts string columns, but column[5] named status has type int) diff --git a/contrib/src/test/results/clientpositive/fileformat_base64.q.out b/contrib/src/test/results/clientpositive/fileformat_base64.q.out index 058a306..3489270 100644 --- a/contrib/src/test/results/clientpositive/fileformat_base64.q.out +++ b/contrib/src/test/results/clientpositive/fileformat_base64.q.out @@ -28,10 +28,12 @@ PREHOOK: query: CREATE TABLE base64_test(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.hive.contrib.fileformat.base64.Base64TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.contrib.fileformat.base64.Base64TextOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE base64_test(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.hive.contrib.fileformat.base64.Base64TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.contrib.fileformat.base64.Base64TextOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@base64_test PREHOOK: query: DESCRIBE EXTENDED base64_test PREHOOK: type: DESCTABLE diff --git a/contrib/src/test/results/clientpositive/serde_regex.q.out b/contrib/src/test/results/clientpositive/serde_regex.q.out index fdbbabc..b75ccec 100644 --- a/contrib/src/test/results/clientpositive/serde_regex.q.out +++ b/contrib/src/test/results/clientpositive/serde_regex.q.out @@ -67,6 +67,7 @@ WITH SERDEPROPERTIES ( ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE serde_regex( host STRING, identity STRING, @@ -84,18 +85,23 @@ WITH SERDEPROPERTIES ( ) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@serde_regex PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@serde_regex POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@serde_regex PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@serde_regex POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@serde_regex PREHOOK: query: SELECT * FROM serde_regex ORDER BY time PREHOOK: type: QUERY diff --git a/contrib/src/test/results/clientpositive/serde_s3.q.out b/contrib/src/test/results/clientpositive/serde_s3.q.out index 9054571..b8b74f8 100644 --- a/contrib/src/test/results/clientpositive/serde_s3.q.out +++ b/contrib/src/test/results/clientpositive/serde_s3.q.out @@ -6,10 +6,12 @@ PREHOOK: query: CREATE TABLE s3log ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.s3.S3LogDeserializer' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE s3log ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.s3.S3LogDeserializer' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@s3log PREHOOK: query: DESCRIBE s3log PREHOOK: type: DESCTABLE @@ -34,9 +36,11 @@ referer string from deserializer useragent string from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../../contrib/data/files/s3.log' INTO TABLE s3log PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@s3log POSTHOOK: query: LOAD DATA LOCAL INPATH '../../contrib/data/files/s3.log' INTO TABLE s3log POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@s3log PREHOOK: query: SELECT a.* FROM s3log a PREHOOK: type: QUERY diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes.q.out index de62b52..f70dcae 100644 --- a/contrib/src/test/results/clientpositive/serde_typedbytes.q.out +++ b/contrib/src/test/results/clientpositive/serde_typedbytes.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table dest1 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out index a72a99c..108ceed 100644 --- a/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out +++ b/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table dest1 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE dest1(key SMALLINT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key SMALLINT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out index f7f3efe..8419c11 100644 --- a/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out +++ b/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table dest1 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out index 7a942da..55ff6ed 100644 --- a/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out +++ b/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table dest1 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out index 1066300..ea46eaa 100644 --- a/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out +++ b/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table dest1 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes6.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes6.q.out index 37ad978..d14ed2e 100644 --- a/contrib/src/test/results/clientpositive/serde_typedbytes6.q.out +++ b/contrib/src/test/results/clientpositive/serde_typedbytes6.q.out @@ -12,18 +12,24 @@ POSTHOOK: query: DROP TABLE table3 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE table1 (a STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table1 (a STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: CREATE TABLE table2 (a STRING, b STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table2 (a STRING, b STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 PREHOOK: query: CREATE TABLE table3 (a STRING, b STRING, c STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table3 (a STRING, b STRING, c STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table3 PREHOOK: query: DROP TABLE table1 PREHOOK: type: DROPTABLE diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes_null.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes_null.q.out index 39dcfd2..d088b16 100644 --- a/contrib/src/test/results/clientpositive/serde_typedbytes_null.q.out +++ b/contrib/src/test/results/clientpositive/serde_typedbytes_null.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: DROP TABLE table1 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE table1 (a STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table1 (a STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: INSERT OVERWRITE TABLE table1 SELECT NULL FROM SRC PREHOOK: type: QUERY diff --git a/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out b/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out index 9508fa2..c5bfd6a 100644 --- a/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out +++ b/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out @@ -17,6 +17,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:hbasedb POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) -- Hadoop 0.23 changes the behavior FsShell on Exit Codes -- In Hadoop 0.20 @@ -32,6 +33,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:hbasedb POSTHOOK: Output: hbaseDB@hbase_table_0 Found 3 items #### A masked pattern was here #### diff --git a/hbase-handler/src/test/results/positive/external_table_ppd.q.out b/hbase-handler/src/test/results/positive/external_table_ppd.q.out index d19a8e8..200fcf1 100644 --- a/hbase-handler/src/test/results/positive/external_table_ppd.q.out +++ b/hbase-handler/src/test/results/positive/external_table_ppd.q.out @@ -15,6 +15,7 @@ WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:binarykey#-,cf:binarybyte#-, TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE t_hbase(key STRING, tinyint_col TINYINT, smallint_col SMALLINT, @@ -28,6 +29,7 @@ WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:binarykey#-,cf:binarybyte#-, TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase PREHOOK: query: DESCRIBE FORMATTED t_hbase PREHOOK: type: DESCTABLE diff --git a/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out index 524eef1..340e7ba 100644 --- a/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out @@ -9,6 +9,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:cq-boolean,cf:cq-byte,cf:cq-short,cf:cq-int,cf:cq-long,cf:cq-string,cf:cq-float,cf:cq-double") TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_1 (key STRING, c_bool BOOLEAN, c_byte TINYINT, c_short SMALLINT, c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE) @@ -16,6 +17,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:cq-boolean,cf:cq-byte,cf:cq-short,cf:cq-int,cf:cq-long,cf:cq-string,cf:cq-float,cf:cq-double") TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_1 PREHOOK: query: SELECT * FROM t_ext_hbase_1 PREHOOK: type: QUERY @@ -47,6 +49,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:cq-boolean#b,cf:cq-byte#b,cf:cq-short#b,cf:cq-int#b,cf:cq-long#b,cf:cq-string#b,cf:cq-float#b,cf:cq-double#b") TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_2 (key STRING, c_bool BOOLEAN, c_byte TINYINT, c_short SMALLINT, c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE) @@ -54,6 +57,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:cq-boolean#b,cf:cq-byte#b,cf:cq-short#b,cf:cq-int#b,cf:cq-long#b,cf:cq-string#b,cf:cq-float#b,cf:cq-double#b") TBLPROPERTIES ("hbase.table.name" = "HiveExternalTable") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_2 PREHOOK: query: SELECT * FROM t_ext_hbase_2 PREHOOK: type: QUERY @@ -87,6 +91,7 @@ TBLPROPERTIES ( "hbase.table.name" = "HiveExternalTable", "hbase.table.default.storage.type" = "binary") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_3 (key STRING, c_bool BOOLEAN, c_byte TINYINT, c_short SMALLINT, c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE) @@ -96,6 +101,7 @@ TBLPROPERTIES ( "hbase.table.name" = "HiveExternalTable", "hbase.table.default.storage.type" = "binary") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_3 PREHOOK: query: SELECT * from t_ext_hbase_3 PREHOOK: type: QUERY diff --git a/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out index 8984da1..d1d1e02 100644 --- a/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out @@ -11,6 +11,7 @@ PREHOOK: query: CREATE TABLE hbase_src(key STRING, double_col DOUBLE, string_col STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_src(key STRING, tinyint_col TINYINT, smallint_col SMALLINT, @@ -20,6 +21,7 @@ POSTHOOK: query: CREATE TABLE hbase_src(key STRING, double_col DOUBLE, string_col STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_src PREHOOK: query: INSERT OVERWRITE TABLE hbase_src SELECT key, key, key, key, key, key, key, value @@ -68,6 +70,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE t_hbase_maps(key STRING, tinyint_map_col MAP, smallint_map_col MAP, @@ -81,6 +84,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_maps POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -209,6 +213,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING, tinyint_map_col MAP, smallint_map_col MAP, @@ -222,6 +227,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -290,6 +296,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_1(key STRING, tinyint_map_col MAP, smallint_map_col MAP, @@ -303,6 +310,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps_1 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -373,6 +381,7 @@ TBLPROPERTIES ( "hbase.table.name"="t_hive_maps", "hbase.table.default.storage.type"="binary") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_2(key STRING, tinyint_map_col MAP, smallint_map_col MAP, @@ -388,6 +397,7 @@ TBLPROPERTIES ( "hbase.table.name"="t_hive_maps", "hbase.table.default.storage.type"="binary") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps_2 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -456,6 +466,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#b:b,cf-smallint:#b:b,cf-int:#b:b,cf-bigint:#b:b,cf-float:#b:b,cf-double:#b:b,cf-string:#b:b,cf-boolean:#b:b") TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE t_hbase_maps_1(key STRING, tinyint_map_col MAP, smallint_map_col MAP, @@ -469,6 +480,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#b:b,cf-smallint:#b:b,cf-int:#b:b,cf-bigint:#b:b,cf-float:#b:b,cf-double:#b:b,cf-string:#b:b,cf-boolean:#b:b") TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_maps_1 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -597,6 +609,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_3(key STRING, tinyint_map_col MAP, smallint_map_col MAP, @@ -610,6 +623,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key#b,cf-tinyint:#bi:bi,cf-smallint:#bin:bin,cf-int:#bina:bina,cf-bigint:#binar:binar,cf-float:#binary:binary,cf-double:#b:b,cf-string:#bi:bi,cf-boolean:#bin:bin") TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps_3 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -678,6 +692,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_4(key STRING, tinyint_map_col MAP, smallint_map_col MAP, @@ -691,6 +706,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-tinyint:,cf-smallint:,cf-int:,cf-bigint:,cf-float:,cf-double:,cf-string:,cf-boolean:") TBLPROPERTIES ("hbase.table.name"="t_hive_maps_1") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps_4 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -761,6 +777,7 @@ TBLPROPERTIES ( "hbase.table.name"="t_hive_maps_1", "hbase.table.default.storage.type"="binary") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_5(key STRING, tinyint_map_col MAP, smallint_map_col MAP, @@ -776,6 +793,7 @@ TBLPROPERTIES ( "hbase.table.name"="t_hive_maps_1", "hbase.table.default.storage.type"="binary") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps_5 POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out b/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out index d086010..fb676ea 100644 --- a/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out +++ b/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out @@ -11,6 +11,7 @@ PREHOOK: query: CREATE TABLE hbase_src(key STRING, double_col DOUBLE, string_col STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_src(key STRING, tinyint_col TINYINT, smallint_col SMALLINT, @@ -20,6 +21,7 @@ POSTHOOK: query: CREATE TABLE hbase_src(key STRING, double_col DOUBLE, string_col STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_src PREHOOK: query: INSERT OVERWRITE TABLE hbase_src SELECT key, key, key, key, key, key, key, value @@ -62,6 +64,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:,cf-string:simple_string_col") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE t_hbase_maps(key STRING, string_map_col MAP, simple_string_col STRING) @@ -69,6 +72,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:,cf-string:simple_string_col") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_maps POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -166,12 +170,14 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_col.*,cf-string:simple_string_col") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING, string_map_cols MAP, simple_string_col STRING) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping"=":key,cf-string:string_col.*,cf-string:simple_string_col") TBLPROPERTIES ("hbase.table.name"="t_hive_maps") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_ext_hbase_maps POSTHOOK: Lineage: hbase_src.bigint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hbase_src.double_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out index 12fcaf7..e42b52a 100644 --- a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out @@ -15,6 +15,7 @@ WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binar TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE t_hbase(key STRING, tinyint_col TINYINT, smallint_col SMALLINT, @@ -28,6 +29,7 @@ WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binar TBLPROPERTIES ("hbase.table.name" = "t_hive", "hbase.table.default.storage.type" = "binary") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase PREHOOK: query: DESCRIBE FORMATTED t_hbase PREHOOK: type: DESCTABLE @@ -187,6 +189,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") TBLPROPERTIES ("hbase.table.name" = "t_hive") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_hbase_1(key STRING, tinyint_col TINYINT, smallint_col SMALLINT, @@ -199,6 +202,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") TBLPROPERTIES ("hbase.table.name" = "t_hive") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_1 PREHOOK: query: DESCRIBE FORMATTED t_hbase_1 PREHOOK: type: DESCTABLE @@ -332,6 +336,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") TBLPROPERTIES ("hbase.table.name" = "t_hive_2") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE t_hbase_2(key STRING, tinyint_col TINYINT, smallint_col SMALLINT, @@ -344,6 +349,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#-,cf:binarybyte#-,cf:binaryshort#-,cf:binaryint#-,cf:binarylong#-,cf:binaryfloat#-,cf:binarydouble#-,cf:binaryboolean#-") TBLPROPERTIES ("hbase.table.name" = "t_hive_2") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_2 PREHOOK: query: INSERT OVERWRITE TABLE t_hbase_2 SELECT 'user1', 1, 1, 1, 1, 1.0, 1.0, true @@ -464,6 +470,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") TBLPROPERTIES ("hbase.table.name" = "t_hive_2") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_hbase_3(key STRING, tinyint_col TINYINT, smallint_col SMALLINT, @@ -476,6 +483,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#b,cf:binarybyte#b,cf:binaryshort#b,cf:binaryint#b,cf:binarylong#b,cf:binaryfloat#b,cf:binarydouble#b,cf:binaryboolean#b") TBLPROPERTIES ("hbase.table.name" = "t_hive_2") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_3 PREHOOK: query: SELECT * FROM t_hbase_3 PREHOOK: type: QUERY @@ -564,6 +572,7 @@ TBLPROPERTIES ( "hbase.table.name" = "t_hive_2", "hbase.table.default.storage.type" = "binary") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE t_hbase_4(key STRING, tinyint_col TINYINT, smallint_col SMALLINT, @@ -578,6 +587,7 @@ TBLPROPERTIES ( "hbase.table.name" = "t_hive_2", "hbase.table.default.storage.type" = "binary") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t_hbase_4 PREHOOK: query: SELECT * FROM t_hbase_4 PREHOOK: type: QUERY diff --git a/hbase-handler/src/test/results/positive/hbase_bulk.m.out b/hbase-handler/src/test/results/positive/hbase_bulk.m.out index e363214..9f46d1f 100644 --- a/hbase-handler/src/test/results/positive/hbase_bulk.m.out +++ b/hbase-handler/src/test/results/positive/hbase_bulk.m.out @@ -14,6 +14,7 @@ INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.hbase.HiveHFileOutputFormat' #### A masked pattern was here #### PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- this is a dummy table used for controlling how the HFiles are -- created create table hbsort(key string, val string, val2 string) @@ -22,6 +23,7 @@ INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.hbase.HiveHFileOutputFormat' #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbsort PREHOOK: query: -- this is a dummy table used for controlling how the input file -- for TotalOrderPartitioner is created @@ -35,6 +37,8 @@ outputformat 'org.apache.hadoop.hive.ql.io.HiveNullValueSequenceFileOutputFormat' #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: -- this is a dummy table used for controlling how the input file -- for TotalOrderPartitioner is created create table hbpartition(part_break string) @@ -47,6 +51,8 @@ outputformat 'org.apache.hadoop.hive.ql.io.HiveNullValueSequenceFileOutputFormat' #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbpartition PREHOOK: query: -- this should produce one file, but we do not -- know what it will be called, so we will copy it to a well known diff --git a/hbase-handler/src/test/results/positive/hbase_joins.q.out b/hbase-handler/src/test/results/positive/hbase_joins.q.out index 2c2f89d..5e1352a 100644 --- a/hbase-handler/src/test/results/positive/hbase_joins.q.out +++ b/hbase-handler/src/test/results/positive/hbase_joins.q.out @@ -22,6 +22,7 @@ WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:state,info:country,info:country_id" ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- From HIVE-1257 CREATE TABLE users(key string, state string, country string, country_id int) @@ -30,6 +31,7 @@ WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:state,info:country,info:country_id" ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@users PREHOOK: query: CREATE TABLE states(key string, name string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' @@ -37,12 +39,14 @@ WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "state:name" ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE states(key string, name string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "state:name" ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@states PREHOOK: query: CREATE TABLE countries(key string, name string, country string, country_id int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' @@ -50,12 +54,14 @@ WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:name,info:country,info:country_id" ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE countries(key string, name string, country string, country_id int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "info:name,info:country,info:country_id" ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@countries PREHOOK: query: INSERT OVERWRITE TABLE users SELECT 'user1', 'IA', 'USA', 0 FROM src WHERE key=100 @@ -217,19 +223,23 @@ PREHOOK: query: CREATE TABLE users(key int, userid int, username string, created STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:nickname,f:created") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE users(key int, userid int, username string, created int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:nickname,f:created") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@users PREHOOK: query: CREATE TABLE users_level(key int, userid int, level int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:level") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE users_level(key int, userid int, level int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,f:userid,f:level") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@users_level PREHOOK: query: -- HIVE-1903: the problem fixed here showed up even without any data, -- so no need to load any to test it diff --git a/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out b/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out index e31d339..9cd29a3 100644 --- a/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out +++ b/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out @@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE hbase_pushdown(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_pushdown(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_pushdown PREHOOK: query: INSERT OVERWRITE TABLE hbase_pushdown SELECT cast(key as string), value diff --git a/hbase-handler/src/test/results/positive/hbase_pushdown.q.out b/hbase-handler/src/test/results/positive/hbase_pushdown.q.out index d7edbce..ee9e20c 100644 --- a/hbase-handler/src/test/results/positive/hbase_pushdown.q.out +++ b/hbase-handler/src/test/results/positive/hbase_pushdown.q.out @@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE hbase_pushdown(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_pushdown(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_pushdown PREHOOK: query: INSERT OVERWRITE TABLE hbase_pushdown SELECT * diff --git a/hbase-handler/src/test/results/positive/hbase_queries.q.out b/hbase-handler/src/test/results/positive/hbase_queries.q.out index 945f5f0..77569b7 100644 --- a/hbase-handler/src/test/results/positive/hbase_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out @@ -7,11 +7,13 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_table_1(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_1 PREHOOK: query: DESCRIBE EXTENDED hbase_table_1 PREHOOK: type: DESCTABLE @@ -76,11 +78,13 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_2(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") TBLPROPERTIES ("hbase.table.name" = "hbase_table_0") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_2 PREHOOK: query: EXPLAIN SELECT Y.* @@ -359,10 +363,12 @@ PREHOOK: query: CREATE TABLE empty_hbase_table(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE empty_hbase_table(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@empty_hbase_table PREHOOK: query: DROP TABLE empty_normal_table PREHOOK: type: DROPTABLE @@ -370,8 +376,10 @@ POSTHOOK: query: DROP TABLE empty_normal_table POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE empty_normal_table(key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE empty_normal_table(key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@empty_normal_table PREHOOK: query: select * from (select count(1) as c from empty_normal_table union all select count(1) as c from empty_hbase_table) x order by c PREHOOK: type: QUERY @@ -427,12 +435,14 @@ WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "cf:val,cf2:count" ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_table_3(key int, value string, count int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "cf:val,cf2:count" ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_3 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE hbase_table_3 @@ -609,12 +619,14 @@ WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "a:b,a:c,d:e" ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_table_4(key int, value1 string, value2 int, value3 int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "a:b,a:c,d:e" ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_4 PREHOOK: query: INSERT OVERWRITE TABLE hbase_table_4 SELECT key, value, key+1, key+2 FROM src WHERE key=98 OR key=100 @@ -645,11 +657,13 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "a:") TBLPROPERTIES ("hbase.table.name" = "hbase_table_4") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE hbase_table_5(key int, value map) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = "a:") TBLPROPERTIES ("hbase.table.name" = "hbase_table_4") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_5 PREHOOK: query: SELECT * FROM hbase_table_5 ORDER BY key PREHOOK: type: QUERY @@ -671,12 +685,14 @@ WITH SERDEPROPERTIES ( "hbase.columns.mapping" = ":key,cf:" ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_table_6(key int, value map) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = ":key,cf:" ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_6 PREHOOK: query: INSERT OVERWRITE TABLE hbase_table_6 SELECT key, map(value, key) FROM src WHERE key=98 OR key=100 @@ -708,12 +724,14 @@ WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "cf:,:key" ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_table_7(value map, key int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "cf:,:key" ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_7 PREHOOK: query: INSERT OVERWRITE TABLE hbase_table_7 SELECT map(value, key, upper(value), key+1), key FROM src @@ -747,12 +765,14 @@ WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "a:b,a:c,d:e" ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_table_8(key int, value1 string, value2 int, value3 int) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ( "hbase.columns.mapping" = "a:b,a:c,d:e" ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_table_8 PREHOOK: query: INSERT OVERWRITE TABLE hbase_table_8 SELECT key, value, key+1, key+2 FROM src WHERE key=98 OR key=100 diff --git a/hbase-handler/src/test/results/positive/hbase_scan_params.q.out b/hbase-handler/src/test/results/positive/hbase_scan_params.q.out index 386aef1..3f0669c 100644 --- a/hbase-handler/src/test/results/positive/hbase_scan_params.q.out +++ b/hbase-handler/src/test/results/positive/hbase_scan_params.q.out @@ -3,11 +3,13 @@ STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string", "hbase.scan.cache" = "500", "hbase.scan.cacheblocks" = "true", "hbase.scan.batch" = "1") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_pushdown(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string", "hbase.scan.cache" = "500", "hbase.scan.cacheblocks" = "true", "hbase.scan.batch" = "1") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_pushdown PREHOOK: query: INSERT OVERWRITE TABLE hbase_pushdown SELECT * FROM src PREHOOK: type: QUERY diff --git a/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out b/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out index e4d2f0b..d958c5d 100644 --- a/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out +++ b/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out @@ -1,18 +1,22 @@ PREHOOK: query: -- HIVE-4375 Single sourced multi insert consists of native and non-native table mixed throws NPE CREATE TABLE src_x1(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-4375 Single sourced multi insert consists of native and non-native table mixed throws NPE CREATE TABLE src_x1(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_x1 PREHOOK: query: CREATE TABLE src_x2(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key, cf:value") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_x2(key string, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key, cf:value") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_x2 PREHOOK: query: explain from src a diff --git a/hbase-handler/src/test/results/positive/hbase_stats.q.out b/hbase-handler/src/test/results/positive/hbase_stats.q.out index 888b364..f05b8ff 100644 --- a/hbase-handler/src/test/results/positive/hbase_stats.q.out +++ b/hbase-handler/src/test/results/positive/hbase_stats.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table stats_src like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_src like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_src PREHOOK: query: insert overwrite table stats_src select * from src PREHOOK: type: QUERY @@ -61,8 +63,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: create table stats_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_part POSTHOOK: Lineage: stats_src.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_src.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/hbase-handler/src/test/results/positive/hbase_stats2.q.out b/hbase-handler/src/test/results/positive/hbase_stats2.q.out index 888b364..f05b8ff 100644 --- a/hbase-handler/src/test/results/positive/hbase_stats2.q.out +++ b/hbase-handler/src/test/results/positive/hbase_stats2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table stats_src like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_src like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_src PREHOOK: query: insert overwrite table stats_src select * from src PREHOOK: type: QUERY @@ -61,8 +63,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: create table stats_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_part POSTHOOK: Lineage: stats_src.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_src.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/hbase-handler/src/test/results/positive/hbase_stats3.q.out b/hbase-handler/src/test/results/positive/hbase_stats3.q.out index 5d71aca..0467f8a 100644 --- a/hbase-handler/src/test/results/positive/hbase_stats3.q.out +++ b/hbase-handler/src/test/results/positive/hbase_stats3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table stats_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_part PREHOOK: query: -- The stats key should be hashed since the max length is too small insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src diff --git a/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out b/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out index 470ee2e..6987f64 100644 --- a/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out +++ b/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- This test verifies that writing an empty partition succeeds w create table tmptable(key string, value string) partitioned by (part string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that writing an empty partition succeeds when -- hive.stats.reliable is set to true. create table tmptable(key string, value string) partitioned by (part string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: insert overwrite table tmptable partition (part = '1') select * from src where key = 'no_such_value' PREHOOK: type: QUERY diff --git a/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out b/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out index 1d91845..192adb6 100644 --- a/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out +++ b/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out @@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE hbase_ppd_keyrange(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#binary,cf:string") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE hbase_ppd_keyrange(key int, value string) STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler' WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key#binary,cf:string") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hbase_ppd_keyrange PREHOOK: query: INSERT OVERWRITE TABLE hbase_ppd_keyrange SELECT * diff --git a/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestPermsGrp.java b/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestPermsGrp.java index 2b0af67..2d71654 100644 --- a/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestPermsGrp.java +++ b/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestPermsGrp.java @@ -20,6 +20,8 @@ import java.io.FileNotFoundException; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import junit.framework.TestCase; @@ -45,15 +47,16 @@ import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hcatalog.ExitException; import org.apache.hcatalog.NoExitSecurityManager; - import org.apache.hcatalog.cli.SemanticAnalysis.HCatSemanticAnalyzer; import org.apache.hcatalog.common.HCatConstants; +import org.apache.hive.hcatalog.cli.HCatCli; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @deprecated Use/modify {@link org.apache.hive.hcatalog.cli.TestPermsGrp} instead */ +@Deprecated public class TestPermsGrp extends TestCase { private boolean isServerRunning = false; @@ -118,7 +121,7 @@ public void testCustomPerms() throws Exception { // Next user did specify perms. try { - HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx-wx---"}); + callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx-wx---"}); } catch (Exception e) { assertTrue(e instanceof ExitException); assertEquals(((ExitException) e).getStatus(), 0); @@ -132,7 +135,7 @@ public void testCustomPerms() throws Exception { hcatConf.set(HCatConstants.HCAT_PERMS, "rwx"); // make sure create table fails. try { - HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx"}); + callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx"}); assert false; } catch (Exception me) { assertTrue(me instanceof ExitException); @@ -161,7 +164,7 @@ public void testCustomPerms() throws Exception { try { // create table must fail. - HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rw-rw-rw-", "-g", "THIS_CANNOT_BE_A_VALID_GRP_NAME_EVER"}); + callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rw-rw-rw-", "-g", "THIS_CANNOT_BE_A_VALID_GRP_NAME_EVER"}); assert false; } catch (Exception me) { assertTrue(me instanceof SecurityException); @@ -189,6 +192,13 @@ public void testCustomPerms() throws Exception { } } + private void callHCatCli(String[] args) { + List argsList = new ArrayList(); + argsList.add("-Dhive.support.concurrency=false"); + argsList.addAll(Arrays.asList(args)); + HCatCli.main(argsList.toArray(new String[]{})); + } + private void silentDropDatabase(String dbName) throws MetaException, TException { try { for (String tableName : msc.getTables(dbName, "*")) { diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java index d61709b..9f38603 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java @@ -20,6 +20,8 @@ import java.io.FileNotFoundException; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import junit.framework.TestCase; @@ -45,7 +47,6 @@ import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hive.hcatalog.ExitException; import org.apache.hive.hcatalog.NoExitSecurityManager; - import org.apache.hive.hcatalog.cli.SemanticAnalysis.HCatSemanticAnalyzer; import org.apache.hive.hcatalog.common.HCatConstants; import org.apache.thrift.TException; @@ -72,8 +73,8 @@ protected void setUp() throws Exception { if (isServerRunning) { return; } - - + + msPort = MetaStoreUtils.findFreePort(); MetaStoreUtils.startMetaStore(msPort, ShimLoader.getHadoopThriftAuthBridge()); @@ -94,6 +95,7 @@ protected void setUp() throws Exception { hcatConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, ""); hcatConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false"); hcatConf.set(HiveConf.ConfVars.METASTORE_CLIENT_SOCKET_TIMEOUT.varname, "60"); + hcatConf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false); clientWH = new Warehouse(hcatConf); msc = new HiveMetaStoreClient(hcatConf, null); System.setProperty(HiveConf.ConfVars.PREEXECHOOKS.varname, " "); @@ -117,7 +119,7 @@ public void testCustomPerms() throws Exception { // Next user did specify perms. try { - HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx-wx---"}); + callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx-wx---"}); } catch (Exception e) { assertTrue(e instanceof ExitException); assertEquals(((ExitException) e).getStatus(), 0); @@ -131,7 +133,7 @@ public void testCustomPerms() throws Exception { hcatConf.set(HCatConstants.HCAT_PERMS, "rwx"); // make sure create table fails. try { - HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx"}); + callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rwx"}); assert false; } catch (Exception me) { assertTrue(me instanceof ExitException); @@ -160,7 +162,7 @@ public void testCustomPerms() throws Exception { try { // create table must fail. - HCatCli.main(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rw-rw-rw-", "-g", "THIS_CANNOT_BE_A_VALID_GRP_NAME_EVER"}); + callHCatCli(new String[]{"-e", "create table simptbl (name string) stored as RCFILE", "-p", "rw-rw-rw-", "-g", "THIS_CANNOT_BE_A_VALID_GRP_NAME_EVER"}); assert false; } catch (Exception me) { assertTrue(me instanceof SecurityException); @@ -188,6 +190,13 @@ public void testCustomPerms() throws Exception { } } + private void callHCatCli(String[] args) { + List argsList = new ArrayList(); + argsList.add("-Dhive.support.concurrency=false"); + argsList.addAll(Arrays.asList(args)); + HCatCli.main(argsList.toArray(new String[]{})); + } + private void silentDropDatabase(String dbName) throws MetaException, TException { try { for (String tableName : msc.getTables(dbName, "*")) { 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 b9bb259..12de644 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 @@ -19,20 +19,21 @@ package org.apache.hive.jdbc; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Statement; import java.util.HashMap; import java.util.Map; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hive.jdbc.miniHS2.MiniHS2; import org.junit.After; import org.junit.AfterClass; @@ -50,6 +51,7 @@ public static void beforeTest() throws Exception { Class.forName(MiniHS2.getJdbcDriverName()); HiveConf conf = new HiveConf(); + conf.setBoolVar(ConfVars.HIVE_SUPPORT_CONCURRENCY, false); miniHS2 = new MiniHS2(conf); String dataFileDir = conf.get("test.data.files").replace('\\', '/') .replace("c:", ""); @@ -60,8 +62,13 @@ public static void beforeTest() throws Exception { @Before public void setUp() throws Exception { - hs2Conn = DriverManager.getConnection(miniHS2.getJdbcURL(), System.getProperty("user.name"), "bar"); - hs2Conn.createStatement().execute("set hive.support.concurrency = false"); + hs2Conn = getConnection(miniHS2.getJdbcURL(), System.getProperty("user.name"), "bar"); + } + + private Connection getConnection(String jdbcURL, String user, String pwd) throws SQLException { + Connection conn = DriverManager.getConnection(jdbcURL, user, pwd); + conn.createStatement().execute("set hive.support.concurrency = false"); + return conn; } @After @@ -113,7 +120,7 @@ public void testURIDatabaseName() throws Exception{ String jdbcUri = miniHS2.getJdbcURL().substring(0, miniHS2.getJdbcURL().indexOf("default")); - hs2Conn= DriverManager.getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar"); + hs2Conn= getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar"); String dbName="test_connection_non_default_db"; String tableInNonDefaultSchema="table_in_non_default_schema"; Statement stmt = hs2Conn.createStatement(); @@ -121,13 +128,13 @@ public void testURIDatabaseName() throws Exception{ stmt.close(); hs2Conn.close(); - hs2Conn = DriverManager.getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar"); + hs2Conn = getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar"); stmt = hs2Conn .createStatement(); boolean expected = stmt.execute(" create table "+tableInNonDefaultSchema +" (x int)"); stmt.close(); hs2Conn .close(); - hs2Conn = DriverManager.getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar"); + hs2Conn = getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar"); stmt = hs2Conn .createStatement(); ResultSet res = stmt.executeQuery("show tables"); boolean testTableExists = false; @@ -142,7 +149,7 @@ public void testURIDatabaseName() throws Exception{ stmt.close(); hs2Conn .close(); - hs2Conn = DriverManager.getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar"); + hs2Conn = getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar"); stmt = hs2Conn .createStatement(); res = stmt.executeQuery("show tables"); testTableExists = false; @@ -158,7 +165,7 @@ public void testURIDatabaseName() throws Exception{ stmt.close(); hs2Conn .close(); - hs2Conn = DriverManager.getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar"); + hs2Conn = getConnection(jdbcUri+dbName,System.getProperty("user.name"),"bar"); stmt = hs2Conn .createStatement(); stmt.execute("set hive.support.concurrency = false"); res = stmt.executeQuery("show tables"); @@ -166,8 +173,8 @@ public void testURIDatabaseName() throws Exception{ stmt.execute(" drop table if exists table_in_non_default_schema"); expected = stmt.execute("DROP DATABASE "+ dbName); stmt.close(); - - hs2Conn = DriverManager.getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar"); + + hs2Conn = getConnection(jdbcUri+"default",System.getProperty("user.name"),"bar"); stmt = hs2Conn .createStatement(); res = stmt.executeQuery("show tables"); testTableExists = false; @@ -179,15 +186,15 @@ public void testURIDatabaseName() throws Exception{ } // test URI with no dbName - hs2Conn = DriverManager.getConnection(jdbcUri, System.getProperty("user.name"),"bar"); + hs2Conn = getConnection(jdbcUri, System.getProperty("user.name"),"bar"); verifyCurrentDB("default", hs2Conn); hs2Conn.close(); - hs2Conn = DriverManager.getConnection(jdbcUri + ";", System.getProperty("user.name"),"bar"); + hs2Conn = getConnection(jdbcUri + ";", System.getProperty("user.name"),"bar"); verifyCurrentDB("default", hs2Conn); hs2Conn.close(); - hs2Conn = DriverManager.getConnection(jdbcUri + ";/foo=bar;foo1=bar1", System.getProperty("user.name"),"bar"); + hs2Conn = getConnection(jdbcUri + ";/foo=bar;foo1=bar1", System.getProperty("user.name"),"bar"); verifyCurrentDB("default", hs2Conn); hs2Conn.close(); } @@ -224,7 +231,7 @@ public void testConnectionSchemaAPIs() throws Exception { } /** - * verify that the current db is the one expected. first create table as .tab and then + * verify that the current db is the one expected. first create table as .tab and then * describe that table to check if is the current database * @param expectedDbName * @param hs2Conn diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java index 7b8f356..84f508c 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hive.service.cli.CLIServiceClient; import org.apache.hive.service.cli.OperationHandle; import org.apache.hive.service.cli.RowSet; @@ -48,6 +49,7 @@ public static void beforeTest() throws IOException { @Before public void setUp() throws Exception { confOverlay = new HashMap(); + confOverlay.put(ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false"); miniHS2.start(confOverlay); } diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java index ca43932..804aa5a 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java @@ -52,6 +52,7 @@ import java.util.regex.Pattern; import junit.framework.Assert; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -86,8 +87,8 @@ import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer; import org.apache.hadoop.hive.serde2.thrift.test.Complex; -import org.apache.hadoop.hive.shims.HadoopShims; import org.apache.hadoop.hive.shims.Hadoop23Shims; +import org.apache.hadoop.hive.shims.HadoopShims; import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.mapred.SequenceFileInputFormat; import org.apache.hadoop.mapred.SequenceFileOutputFormat; @@ -100,9 +101,7 @@ import org.apache.zookeeper.ZooKeeper; import org.junit.Assume; -import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Ordering; /** * QTestUtil. @@ -1249,6 +1248,8 @@ private void maskPatterns(Pattern[] patterns, String fname) throws Exception { ".*job_local[0-9_]*.*", ".*USING 'java -cp.*", "^Deleted.*", + ".*Input:.*/data/files/.*", + ".*Output:.*/data/files/.*" }); public int checkCliDriverResults(String tname) throws Exception { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java index 83d5bfc..332cadb 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java @@ -593,7 +593,7 @@ private void doAuthorization(BaseSemanticAnalyzer sem) continue; } Table tbl = read.getTable(); - if ((read.getPartition() != null) || (tbl.isPartitioned())) { + if ((read.getPartition() != null) || (tbl != null && tbl.isPartitioned())) { String tblName = tbl.getTableName(); if (tableUsePartLevelAuth.get(tblName) == null) { boolean usePartLevelPriv = (tbl.getParameters().get( @@ -734,6 +734,10 @@ private void doAuthorizationV2(SessionState ss, HiveOperation op, HashSet getParents() { return parents; @@ -136,4 +148,5 @@ public void setDirect(boolean isDirect) { } + } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java index 0493302..ae8b4bb 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java @@ -22,8 +22,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.api.Database; -import org.apache.hadoop.hive.ql.metadata.Partition; import org.apache.hadoop.hive.ql.metadata.DummyPartition; +import org.apache.hadoop.hive.ql.metadata.Partition; import org.apache.hadoop.hive.ql.metadata.Table; /** @@ -32,6 +32,8 @@ */ public class WriteEntity extends Entity implements Serializable { + private boolean isTempURI = false; + /** * Only used by serialization. */ @@ -50,7 +52,7 @@ public WriteEntity(Database database) { * Table that is written to. */ public WriteEntity(Table t) { - super(t, true); + this(t, true); } public WriteEntity(Table t, boolean complete) { @@ -80,7 +82,22 @@ public WriteEntity(DummyPartition p, boolean complete) { * Flag to decide whether this directory is local or in dfs. */ public WriteEntity(Path d, boolean islocal) { + this(d, islocal, false); + } + + /** + * Constructor for a file. + * + * @param d + * The name of the directory that is being written to. + * @param islocal + * Flag to decide whether this directory is local or in dfs. + * @param isTemp + * True if this is a temporary location such as scratch dir + */ + public WriteEntity(Path d, boolean islocal, boolean isTemp) { super(d.toString(), islocal, true); + this.isTempURI = isTemp; } /** @@ -99,4 +116,9 @@ public boolean equals(Object o) { return false; } } + + public boolean isTempURI() { + return isTempURI; + } + } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java index 0b7c128..f9bff1b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java @@ -2567,7 +2567,7 @@ public void cancelDelegationToken(String tokenStrForm) } } - private static String[] getQualifiedNames(String qualifiedName) { + public static String[] getQualifiedNames(String qualifiedName) { return qualifiedName.split("\\."); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java index 1f539ef..2484576 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java @@ -42,6 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hive.common.FileUtils; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.MetaStoreUtils; @@ -666,6 +667,7 @@ private void analyzeCreateDatabase(ASTNode ast) throws SemanticException { break; case TOK_DATABASELOCATION: dbLocation = unescapeSQLString(childNode.getChild(0).getText()); + addLocationToOutputs(dbLocation); break; default: throw new SemanticException("Unrecognized token in CREATE DATABASE statement"); @@ -970,6 +972,7 @@ private void analyzeCreateIndex(ASTNode ast) throws SemanticException { break; case HiveParser.TOK_TABLELOCATION: location = unescapeSQLString(child.getChild(0).getText()); + addLocationToOutputs(location); break; case HiveParser.TOK_TABLEPROPERTIES: tblProps = DDLSemanticAnalyzer.getProps((ASTNode) child.getChild(0)); @@ -1342,12 +1345,13 @@ private void analyzeAlterTableLocation(ASTNode ast, String tableName, HashMap partSpec) throws SemanticException { String newLocation = unescapeSQLString(ast.getChild(0).getText()); - + addLocationToOutputs(newLocation); AlterTableDesc alterTblDesc = new AlterTableDesc(tableName, newLocation, partSpec); addInputsOutputsAlterTable(tableName, partSpec, alterTblDesc); rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(), alterTblDesc), conf)); + } private void analyzeAlterTableProtectMode(ASTNode ast, String tableName, @@ -2520,7 +2524,7 @@ private void analyzeAlterTableAddParts(CommonTree ast, boolean expectView) Table tab = getTable(tblName, true); boolean isView = tab.isView(); validateAlterTableType(tab, AlterTableTypes.ADDPARTITION, expectView); - inputs.add(new ReadEntity(tab)); + outputs.add(new WriteEntity(tab)); int numCh = ast.getChildCount(); int start = ifNotExists ? 2 : 1; @@ -2547,6 +2551,17 @@ private void analyzeAlterTableAddParts(CommonTree ast, boolean expectView) throw new SemanticException("LOCATION clause illegal for view partition"); } currentLocation = unescapeSQLString(child.getChild(0).getText()); + boolean isLocal = false; + try { + // do best effor to determine if this is a local file + String scheme = new URI(currentLocation).getScheme(); + if (scheme != null) { + isLocal = FileUtils.isLocalFile(conf, currentLocation); + } + } catch (URISyntaxException e) { + LOG.warn("Unable to create URI from " + currentLocation, e); + } + inputs.add(new ReadEntity(new Path(currentLocation), isLocal)); break; default: throw new SemanticException("Unknown child: " + child); @@ -3159,6 +3174,7 @@ private void analyzeAlterTableSkewedLocation(ASTNode ast, String tableName, .getText())); validateSkewedLocationString(newLocation); locations.put(keyList, newLocation); + addLocationToOutputs(newLocation); } } } @@ -3172,6 +3188,10 @@ private void analyzeAlterTableSkewedLocation(ASTNode ast, String tableName, alterTblDesc), conf)); } + private void addLocationToOutputs(String newLocation) { + outputs.add(new WriteEntity(new Path(newLocation), FileUtils.isLocalFile(conf, newLocation))); + } + /** * Check if the node is constant. * diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java index a22a15f..59aeb96 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java @@ -37,6 +37,7 @@ import org.apache.hadoop.hive.ql.exec.Task; import org.apache.hadoop.hive.ql.exec.TaskFactory; import org.apache.hadoop.hive.ql.exec.Utilities; +import org.apache.hadoop.hive.ql.hooks.ReadEntity; import org.apache.hadoop.hive.ql.hooks.WriteEntity; import org.apache.hadoop.hive.ql.metadata.Hive; import org.apache.hadoop.hive.ql.metadata.HiveException; @@ -217,7 +218,7 @@ public void analyzeInternal(ASTNode ast) throws SemanticException { // make sure the arguments make sense applyConstraints(fromURI, toURI, fromTree, isLocal); - + inputs.add(new ReadEntity(new Path(fromURI), isLocal)); Task rTask = null; // create copy work diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 77388dd..5c261a2 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -34,7 +34,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.antlr.runtime.tree.BaseTree; import org.antlr.runtime.tree.Tree; import org.antlr.runtime.tree.TreeWizard; import org.antlr.runtime.tree.TreeWizard.ContextVisitor; @@ -49,6 +48,7 @@ import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.TableType; import org.apache.hadoop.hive.metastore.Warehouse; +import org.apache.hadoop.hive.metastore.api.Database; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Order; @@ -79,8 +79,8 @@ import org.apache.hadoop.hive.ql.io.CombineHiveInputFormat; import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat; import org.apache.hadoop.hive.ql.io.HiveOutputFormat; -import org.apache.hadoop.hive.ql.io.RCFileInputFormat; import org.apache.hadoop.hive.ql.io.NullRowsInputFormat; +import org.apache.hadoop.hive.ql.io.RCFileInputFormat; import org.apache.hadoop.hive.ql.lib.DefaultGraphWalker; import org.apache.hadoop.hive.ql.lib.Dispatcher; import org.apache.hadoop.hive.ql.lib.GraphWalker; @@ -397,7 +397,7 @@ public void doPhase1QBExpr(ASTNode ast, QBExpr qbexpr, String id, String alias) List wdwFns = new ArrayList(); for (int i = 0; i < selExpr.getChildCount(); ++i) { ASTNode function = (ASTNode) selExpr.getChild(i).getChild(0); - doPhase1GetAllAggregations((ASTNode) function, aggregationTrees, wdwFns); + doPhase1GetAllAggregations(function, aggregationTrees, wdwFns); } // window based aggregations are handled differently @@ -710,13 +710,13 @@ private void processCTE(QB qb, ASTNode ctes) throws SemanticException { * The scoping rules we use are: to search for a CTE from the current QB outwards. In order to * disambiguate between CTES are different levels we qualify(prefix) them with the id of the QB * they appear in when adding them to the aliasToCTEs map. - * + * */ private ASTNode findCTEFromName(QB qb, String cteName) { /* * When saving a view definition all table references in the AST are qualified; including CTE references. - * Where as CTE definitions have no DB qualifier; so we strip out the DB qualifier before searching in + * Where as CTE definitions have no DB qualifier; so we strip out the DB qualifier before searching in * aliasToCTEs map. */ String currDB = SessionState.get().getCurrentDatabase(); @@ -742,17 +742,17 @@ private ASTNode findCTEFromName(QB qb, String cteName) { } return aliasToCTEs.get(cteName); } - + /* * If a CTE is referenced in a QueryBlock: * - add it as a SubQuery for now. - * - SQ.alias is the alias used in QB. (if no alias is specified, + * - SQ.alias is the alias used in QB. (if no alias is specified, * it used the CTE name. Works just like table references) * - Adding SQ done by: * - copying AST of CTE * - setting ASTOrigin on cloned AST. * - trigger phase 1 on new QBExpr. - * - update QB data structs: remove this as a table reference, move it to a SQ invocation. + * - update QB data structs: remove this as a table reference, move it to a SQ invocation. */ private void addCTEAsSubQuery(QB qb, String cteName, String cteAlias) throws SemanticException { cteAlias = cteAlias == null ? cteName : cteAlias; @@ -812,7 +812,7 @@ private void processJoin(QB qb, ASTNode join) throws SemanticException { processPTF(qb, child); PTFInvocationSpec ptfInvocationSpec = qb.getPTFInvocationSpec(child); String inputAlias = ptfInvocationSpec == null ? null : - ((PartitionedTableFunctionSpec)ptfInvocationSpec.getFunction()).getAlias();; + ptfInvocationSpec.getFunction().getAlias();; if ( inputAlias == null ) { throw new SemanticException(generateErrorMessage(child, "PTF invocation in a Join must have an alias")); @@ -1500,6 +1500,7 @@ private void replaceViewReferenceWithDefinition(QB qb, Table tab, tree = ParseUtils.findRootNonNullToken(tree); viewTree = tree; Dispatcher nodeOriginDispatcher = new Dispatcher() { + @Override public Object dispatch(Node nd, java.util.Stack stack, Object... nodeOutputs) { ((ASTNode) nd).setOrigin(viewOrigin); @@ -2071,7 +2072,7 @@ private Operator genHavingPlan(String dest, QB qb, Operator input, output = putOpInsertMap(output, inputRR); return output; } - + private Operator genPlanForSubQueryPredicate( QB qbSQ, ISubQueryJoinInfo subQueryPredicate) throws SemanticException { @@ -2113,15 +2114,15 @@ private Operator genFilterPlan(ASTNode searchCond, QB qb, Operator input, * --> ===CONTINUE_FILTER_PROCESSING=== * endif * endif - * + * * Support for Sub Queries in Having Clause: * - By and large this works the same way as SubQueries in the Where Clause. * - The one addum is the handling of aggregation expressions from the Outer Query - * appearing in correlation clauses. + * appearing in correlation clauses. * - So such correlating predicates are allowed: * min(OuterQuert.x) = SubQuery.y * - this requires special handling when converting to joins. See QBSubQuery.rewrite - * method method for detailed comments. + * method method for detailed comments. */ List subQueriesInOriginalTree = SubQueryUtils.findSubQueries(searchCond); @@ -2159,9 +2160,9 @@ private Operator genFilterPlan(ASTNode searchCond, QB qb, Operator input, QBSubQuery subQuery = SubQueryUtils.buildSubQuery(qb.getId(), sqIdx, subQueryAST, originalSubQueryAST, ctx); - + String havingInputAlias = null; - + if ( forHavingClause ) { havingInputAlias = "gby_sq" + sqIdx; aliasToOpInfo.put(havingInputAlias, input); @@ -2185,7 +2186,7 @@ private Operator genFilterPlan(ASTNode searchCond, QB qb, Operator input, throw new SemanticException(ErrorMsg.INVALID_SUBQUERY_EXPRESSION.getMsg( subQueryAST, "SubQuery can contain only 1 item in Select List.")); } - + /* * If this is a Not In SubQuery Predicate then Join in the Null Check SubQuery. * See QBSubQuery.NotInCheck for details on why and how this is constructed. @@ -2285,7 +2286,7 @@ private Integer genColListRegex(String colRegex, String tabAlias, * if a columnInfo has multiple mappings; then add the column only once, * but carry the mappings forward. */ - Map inputColsProcessed = new HashMap(); + Map inputColsProcessed = new HashMap(); // For expr "*", aliases should be iterated in the order they are specified // in the query. for (String alias : aliases) { @@ -2898,7 +2899,7 @@ private static boolean isRegex(String pattern, HiveConf conf) { String qIdSupport = HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_QUOTEDID_SUPPORT); if ( "column".equals(qIdSupport)) { return false; - } + } for (int i = 0; i < pattern.length(); i++) { if (!Character.isLetterOrDigit(pattern.charAt(i)) && pattern.charAt(i) != '_') { @@ -3131,7 +3132,7 @@ private static boolean isRegex(String pattern, HiveConf conf) { colInfo.setSkewedCol((exp instanceof ExprNodeColumnDesc) ? ((ExprNodeColumnDesc) exp) .isSkewedCol() : false); out_rwsch.put(tabAlias, colAlias, colInfo); - + if ( exp instanceof ExprNodeColumnDesc ) { ExprNodeColumnDesc colExp = (ExprNodeColumnDesc) exp; String[] altMapping = inputRR.getAlternateMappings(colExp.getColumn()); @@ -3413,11 +3414,11 @@ private Operator genGroupByPlanGroupByOperator(QBParseInfo parseInfo, // get the last colName for the reduce KEY // it represents the column name corresponding to distinct aggr, if any String lastKeyColName = null; - List inputKeyCols = ((ReduceSinkDesc) rs.getConf()).getOutputKeyColumnNames(); + List inputKeyCols = rs.getConf().getOutputKeyColumnNames(); if (inputKeyCols.size() > 0) { lastKeyColName = inputKeyCols.get(inputKeyCols.size() - 1); } - List reduceValues = ((ReduceSinkDesc) rs.getConf()).getValueCols(); + List reduceValues = rs.getConf().getValueCols(); int numDistinctUDFs = 0; for (Map.Entry entry : aggregationTrees.entrySet()) { ASTNode value = entry.getValue(); @@ -4209,8 +4210,8 @@ private ReduceSinkOperator genCommonGroupByPlanReduceSinkOperator(QB qb, List entry : nodeOutputs.entrySet()) { - ASTNode parameter = (ASTNode) entry.getKey(); - ExprNodeDesc expression = (ExprNodeDesc) entry.getValue(); + ASTNode parameter = entry.getKey(); + ExprNodeDesc expression = entry.getValue(); if (!(expression instanceof ExprNodeColumnDesc)) { continue; } @@ -4244,7 +4245,7 @@ private ReduceSinkOperator genCommonGroupByPlanReduceSinkOperator(QB qb, List mapping, List keys) { - ExprNodeDesc expr = (ExprNodeDesc) mapping.get(predicate); + ExprNodeDesc expr = mapping.get(predicate); if (expr != null && ExprNodeDescUtils.indexOf(expr, keys) >= 0) { removeRecursively(predicate, mapping); } else { @@ -5479,9 +5480,9 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) } else { // if we are on viewfs we don't want to use /tmp as tmp dir since rename from /tmp/.. // to final /user/hive/warehouse/ will fail later, so instead pick tmp dir - // on same namespace as tbl dir. - queryTmpdir = dest_path.toUri().getScheme().equals("viewfs") ? - ctx.getExtTmpPathRelTo(dest_path.getParent().toUri()) : + // on same namespace as tbl dir. + queryTmpdir = dest_path.toUri().getScheme().equals("viewfs") ? + ctx.getExtTmpPathRelTo(dest_path.getParent().toUri()) : ctx.getExternalTmpPath(dest_path.toUri()); } if (dpCtx != null) { @@ -5577,9 +5578,9 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) // if we are on viewfs we don't want to use /tmp as tmp dir since rename from /tmp/.. // to final /user/hive/warehouse/ will fail later, so instead pick tmp dir - // on same namespace as tbl dir. - queryTmpdir = dest_path.toUri().getScheme().equals("viewfs") ? - ctx.getExtTmpPathRelTo(dest_path.getParent().toUri()) : + // on same namespace as tbl dir. + queryTmpdir = dest_path.toUri().getScheme().equals("viewfs") ? + ctx.getExtTmpPathRelTo(dest_path.getParent().toUri()) : ctx.getExternalTmpPath(dest_path.toUri()); table_desc = Utilities.getTableDesc(dest_tab); @@ -5706,10 +5707,12 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) tblDesc.setCols(new ArrayList(field_schemas)); } + boolean isDestTempFile = true; if (!ctx.isMRTmpFileURI(dest_path.toUri().toString())) { idToTableNameMap.put(String.valueOf(destTableId), dest_path.toUri().toString()); currentTableId = destTableId; destTableId++; + isDestTempFile = false; } boolean isDfsDir = (dest_type.intValue() == QBMetaData.DEST_DFS_FILE); @@ -5727,7 +5730,7 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) table_desc = PlanUtils.getTableDesc(tblDesc, cols, colTypes); } - if (!outputs.add(new WriteEntity(dest_path, !isDfsDir))) { + if (!outputs.add(new WriteEntity(dest_path, !isDfsDir, isDestTempFile))) { throw new SemanticException(ErrorMsg.OUTPUT_SPECIFIED_MULTIPLE_TIMES .getMsg(dest_path.toUri().toString())); } @@ -8787,7 +8790,7 @@ public Operator genPlan(QB qb) throws SemanticException { "Cannot resolve input Operator for PTF invocation")); } lastPTFOp = genPTFPlan(spec, inOp); - String ptfAlias = ((PartitionedTableFunctionSpec)spec.getFunction()).getAlias(); + String ptfAlias = spec.getFunction().getAlias(); if ( ptfAlias != null ) { aliasToOpInfo.put(ptfAlias, lastPTFOp); } @@ -9384,7 +9387,7 @@ private ExprNodeDesc getExprNodeDescCached(ASTNode expr, RowResolver input) Map nodeOutputs = TypeCheckProcFactory.genExprNode(expr, tcCtx); - ExprNodeDesc desc = (ExprNodeDesc) nodeOutputs.get(expr); + ExprNodeDesc desc = nodeOutputs.get(expr); if (desc == null) { String errMsg = tcCtx.getError(); if (errMsg == null) { @@ -9708,6 +9711,7 @@ private ASTNode analyzeCreateTable(ASTNode ast, QB qb) case HiveParser.TOK_TABLELOCATION: location = unescapeSQLString(child.getChild(0).getText()); location = EximUtil.relativeToAbsolutePath(conf, location); + inputs.add(new ReadEntity(new Path(location), FileUtils.isLocalFile(conf, location))); break; case HiveParser.TOK_TABLEPROPERTIES: tblProps = DDLSemanticAnalyzer.getProps((ASTNode) child.getChild(0)); @@ -9762,6 +9766,10 @@ private ASTNode analyzeCreateTable(ASTNode ast, QB qb) } } + String[] qualified = Hive.getQualifiedNames(tableName); + String dbName = qualified.length == 1 ? SessionState.get().getCurrentDatabase() : qualified[0]; + Database database = getDatabase(dbName); + outputs.add(new WriteEntity(database)); // Handle different types of CREATE TABLE command CreateTableDesc crtTblDesc = null; switch (command_type) { @@ -9802,13 +9810,8 @@ private ASTNode analyzeCreateTable(ASTNode ast, QB qb) case CTAS: // create table as select // Verify that the table does not already exist - String databaseName; try { Table dumpTable = db.newTable(tableName); - databaseName = dumpTable.getDbName(); - if (null == db.getDatabase(dumpTable.getDbName())) { - throw new SemanticException(ErrorMsg.DATABASE_NOT_EXISTS.getMsg(dumpTable.getDbName())); - } if (null != db.getTable(dumpTable.getDbName(), dumpTable.getTableName(), false)) { throw new SemanticException(ErrorMsg.TABLE_ALREADY_EXISTS.getMsg(tableName)); } @@ -9818,7 +9821,7 @@ private ASTNode analyzeCreateTable(ASTNode ast, QB qb) tblProps = addDefaultProperties(tblProps); - crtTblDesc = new CreateTableDesc(databaseName, tableName, isExt, cols, partCols, + crtTblDesc = new CreateTableDesc(dbName, tableName, isExt, cols, partCols, bucketCols, sortCols, numBuckets, rowFormatParams.fieldDelim, rowFormatParams.fieldEscape, rowFormatParams.collItemDelim, rowFormatParams.mapKeyDelim, rowFormatParams.lineDelim, @@ -9995,7 +9998,7 @@ private void processPositionAlias(ASTNode ast) throws SemanticException { int pos = Integer.parseInt(node.getText()); if (pos > 0 && pos <= selectExpCnt) { groupbyNode.setChild(child_pos, - (BaseTree) selectNode.getChild(pos - 1).getChild(0)); + selectNode.getChild(pos - 1).getChild(0)); } else { throw new SemanticException( ErrorMsg.INVALID_POSITION_ALIAS_IN_GROUPBY.getMsg( @@ -10022,7 +10025,7 @@ private void processPositionAlias(ASTNode ast) throws SemanticException { if (!isAllCol) { int pos = Integer.parseInt(node.getText()); if (pos > 0 && pos <= selectExpCnt) { - colNode.setChild(0, (BaseTree) selectNode.getChild(pos - 1).getChild(0)); + colNode.setChild(0, selectNode.getChild(pos - 1).getChild(0)); } else { throw new SemanticException( ErrorMsg.INVALID_POSITION_ALIAS_IN_ORDERBY.getMsg( @@ -10565,6 +10568,7 @@ private BoundarySpec processBoundary(int frameType, ASTNode node) throws Semant private static class ConstantExprCheck implements ContextVisitor { boolean isConstant = true; + @Override public void visit(Object t, Object parent, int childIndex, Map labels) { if ( !isConstant ) { return; @@ -10593,6 +10597,7 @@ public AggregationExprCheck(HashMap destAggrExprs) { this.destAggrExprs = destAggrExprs; } + @Override public void visit(Object t, Object parent, int childIndex, Map labels) { if ( isAggr ) { return; @@ -11106,7 +11111,7 @@ private Operator genReduceSinkPlanForWindowing(WindowingSpec spec, return selSpec; } - private void addAlternateGByKeyMappings(ASTNode gByExpr, ColumnInfo colInfo, + private void addAlternateGByKeyMappings(ASTNode gByExpr, ColumnInfo colInfo, Operator reduceSinkOp, RowResolver gByRR) { if ( gByExpr.getType() == HiveParser.DOT && gByExpr.getChild(0).getType() == HiveParser.TOK_TABLE_OR_COL ) { @@ -11129,7 +11134,7 @@ private void addAlternateGByKeyMappings(ASTNode gByExpr, ColumnInfo colInfo, * before any GBy/ReduceSinks added for the GBY operation. */ Operator parent = reduceSinkOp; - while ( parent instanceof ReduceSinkOperator || + while ( parent instanceof ReduceSinkOperator || parent instanceof GroupByOperator ) { parent = parent.getParentOperators().get(0); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java index 93c89de..e661f00 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java @@ -40,7 +40,8 @@ ALTERTABLE_RENAMEPART("ALTERTABLE_RENAMEPART", new Privilege[]{Privilege.DROP}, new Privilege[]{Privilege.CREATE}), ALTERTABLE_RENAME("ALTERTABLE_RENAME", new Privilege[]{Privilege.ALTER_METADATA}, null), ALTERTABLE_DROPPARTS("ALTERTABLE_DROPPARTS", new Privilege[]{Privilege.DROP}, null), - ALTERTABLE_ADDPARTS("ALTERTABLE_ADDPARTS", new Privilege[]{Privilege.CREATE}, null), + // The location is input and table is output for alter-table add partitions + ALTERTABLE_ADDPARTS("ALTERTABLE_ADDPARTS", null, new Privilege[]{Privilege.CREATE}), ALTERTABLE_TOUCH("ALTERTABLE_TOUCH", null, null), ALTERTABLE_ARCHIVE("ALTERTABLE_ARCHIVE", new Privilege[]{Privilege.ALTER_DATA}, null), ALTERTABLE_UNARCHIVE("ALTERTABLE_UNARCHIVE", new Privilege[]{Privilege.ALTER_DATA}, null), diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/SessionStateConfigUserAuthenticator.java b/ql/src/java/org/apache/hadoop/hive/ql/security/SessionStateConfigUserAuthenticator.java index 812105c..8c7809e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/SessionStateConfigUserAuthenticator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/SessionStateConfigUserAuthenticator.java @@ -44,8 +44,12 @@ @Override public String getUserName() { - String newUserName = sessionState.getConf().get("user.name"); - return newUserName != null ? newUserName : System.getProperty("user.name"); + String newUserName = sessionState.getConf().get("user.name", "").trim(); + if (newUserName.isEmpty()) { + return System.getProperty("user.name"); + } else { + return newUserName; + } } @Override diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java index fae6844..7dfd574 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java @@ -54,6 +54,12 @@ private static SQLPrivTypeGrant[] ADMIN_PRIV_AR = arr(SQLPrivTypeGrant.ADMIN_PRIV); private static SQLPrivTypeGrant[] INS_NOGRANT_AR = arr(SQLPrivTypeGrant.INSERT_NOGRANT); private static SQLPrivTypeGrant[] DEL_NOGRANT_AR = arr(SQLPrivTypeGrant.DELETE_NOGRANT); + private static SQLPrivTypeGrant[] OWNER_INS_SEL_DEL_NOGRANT_AR = + arr(SQLPrivTypeGrant.OWNER_PRIV, + SQLPrivTypeGrant.INSERT_NOGRANT, + SQLPrivTypeGrant.DELETE_NOGRANT, + SQLPrivTypeGrant.SELECT_NOGRANT); + static { @@ -62,10 +68,11 @@ op2Priv.put(HiveOperationType.EXPLAIN, new InOutPrivs(SEL_NOGRANT_AR, SEL_NOGRANT_AR)); //?? - op2Priv.put(HiveOperationType.CREATEDATABASE, new InOutPrivs(ADMIN_PRIV_AR, null)); + op2Priv.put(HiveOperationType.CREATEDATABASE, + new InOutPrivs(ADMIN_PRIV_AR, OWNER_INS_SEL_DEL_NOGRANT_AR)); op2Priv.put(HiveOperationType.DROPDATABASE, new InOutPrivs(OWNER_PRIV_AR, null)); - //this should be database usage privilege once it is supported + // this should be database usage privilege once it is supported op2Priv.put(HiveOperationType.SWITCHDATABASE, new InOutPrivs(null, null)); // lock operations not controlled for now @@ -76,13 +83,13 @@ op2Priv.put(HiveOperationType.DESCTABLE, new InOutPrivs(SEL_NOGRANT_AR, null)); op2Priv.put(HiveOperationType.DESCFUNCTION, new InOutPrivs(null, null)); - //meta store check command - require admin priv + // meta store check command - require admin priv op2Priv.put(HiveOperationType.MSCK, new InOutPrivs(ADMIN_PRIV_AR, null)); //alter table commands require table ownership // There should not be output object, but just in case the table is incorrectly added - // to output instead of input, adding owner requirement on output will catch that as wellÿ + // to output instead of input, adding owner requirement on output will catch that as well op2Priv.put(HiveOperationType.ALTERTABLE_ADDCOLS, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); op2Priv.put(HiveOperationType.ALTERTABLE_REPLACECOLS, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); op2Priv.put(HiveOperationType.ALTERTABLE_RENAMECOL, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); @@ -104,16 +111,16 @@ op2Priv.put(HiveOperationType.ALTERPARTITION_PROTECTMODE, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); op2Priv.put(HiveOperationType.ALTERTABLE_FILEFORMAT, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); op2Priv.put(HiveOperationType.ALTERPARTITION_FILEFORMAT, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); - op2Priv.put(HiveOperationType.ALTERTABLE_LOCATION, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); - op2Priv.put(HiveOperationType.ALTERPARTITION_LOCATION, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); + op2Priv.put(HiveOperationType.ALTERTABLE_LOCATION, new InOutPrivs(OWNER_PRIV_AR, OWNER_INS_SEL_DEL_NOGRANT_AR)); + op2Priv.put(HiveOperationType.ALTERPARTITION_LOCATION, new InOutPrivs(OWNER_PRIV_AR, OWNER_INS_SEL_DEL_NOGRANT_AR)); op2Priv.put(HiveOperationType.ALTERTABLE_MERGEFILES, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); op2Priv.put(HiveOperationType.ALTERPARTITION_MERGEFILES, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); op2Priv.put(HiveOperationType.ALTERTABLE_SKEWED, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); - op2Priv.put(HiveOperationType.ALTERTBLPART_SKEWED_LOCATION, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); + op2Priv.put(HiveOperationType.ALTERTBLPART_SKEWED_LOCATION, new InOutPrivs(OWNER_PRIV_AR, OWNER_INS_SEL_DEL_NOGRANT_AR)); op2Priv.put(HiveOperationType.TRUNCATETABLE, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); //table ownership for create/drop/alter index - op2Priv.put(HiveOperationType.CREATEINDEX, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); + op2Priv.put(HiveOperationType.CREATEINDEX, new InOutPrivs(OWNER_PRIV_AR, OWNER_INS_SEL_DEL_NOGRANT_AR)); op2Priv.put(HiveOperationType.DROPINDEX, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); op2Priv.put(HiveOperationType.ALTERINDEX_REBUILD, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); op2Priv.put(HiveOperationType.ALTERINDEX_PROPS, new InOutPrivs(OWNER_PRIV_AR, OWNER_PRIV_AR)); @@ -130,7 +137,8 @@ // operations that require insert/delete privileges op2Priv.put(HiveOperationType.ALTERTABLE_DROPPARTS, new InOutPrivs(DEL_NOGRANT_AR, null)); - op2Priv.put(HiveOperationType.ALTERTABLE_ADDPARTS, new InOutPrivs(INS_NOGRANT_AR, null)); + // in alter-table-add-partition, the table is output, and location is input + op2Priv.put(HiveOperationType.ALTERTABLE_ADDPARTS, new InOutPrivs(OWNER_INS_SEL_DEL_NOGRANT_AR, INS_NOGRANT_AR)); // select with grant for exporting contents op2Priv.put(HiveOperationType.EXPORT, new InOutPrivs(SEL_GRANT_AR, null)); @@ -140,12 +148,13 @@ op2Priv.put(HiveOperationType.SHOWCOLUMNS, new InOutPrivs(SEL_NOGRANT_AR, null)); op2Priv.put(HiveOperationType.SHOW_TABLESTATUS, new InOutPrivs(SEL_NOGRANT_AR, null)); op2Priv.put(HiveOperationType.SHOW_TBLPROPERTIES, new InOutPrivs(SEL_NOGRANT_AR, null)); - op2Priv.put(HiveOperationType.CREATETABLE_AS_SELECT, new InOutPrivs(SEL_NOGRANT_AR, OWNER_PRIV_AR)); + op2Priv.put(HiveOperationType.CREATETABLE_AS_SELECT, new InOutPrivs(SEL_NOGRANT_AR, null)); // QUERY,LOAD op can contain an insert & ovewrite, so require insert+delete privileges on output op2Priv.put(HiveOperationType.QUERY, new InOutPrivs(SEL_NOGRANT_AR, arr(SQLPrivTypeGrant.INSERT_NOGRANT, SQLPrivTypeGrant.DELETE_NOGRANT))); - op2Priv.put(HiveOperationType.LOAD, new InOutPrivs(SEL_NOGRANT_AR, + + op2Priv.put(HiveOperationType.LOAD, new InOutPrivs(OWNER_INS_SEL_DEL_NOGRANT_AR, arr(SQLPrivTypeGrant.INSERT_NOGRANT, SQLPrivTypeGrant.DELETE_NOGRANT))); // show create table is more sensitive information, includes table properties etc @@ -168,8 +177,9 @@ op2Priv.put(HiveOperationType.LOCKTABLE, new InOutPrivs(null, null)); op2Priv.put(HiveOperationType.UNLOCKTABLE, new InOutPrivs(null, null)); - // require db ownership - op2Priv.put(HiveOperationType.CREATETABLE, new InOutPrivs(OWNER_PRIV_AR, null)); + // require db ownership, if there is a file require SELECT , INSERT, and DELETE + op2Priv.put(HiveOperationType.CREATETABLE, + new InOutPrivs(OWNER_INS_SEL_DEL_NOGRANT_AR, null)); op2Priv.put(HiveOperationType.ALTERDATABASE, new InOutPrivs(OWNER_PRIV_AR, null)); op2Priv.put(HiveOperationType.DESCDATABASE, new InOutPrivs(null, null)); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/RequiredPrivileges.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/RequiredPrivileges.java index 10a582b..a577dfe 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/RequiredPrivileges.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/RequiredPrivileges.java @@ -58,6 +58,9 @@ public void addPrivilege(String priv, boolean withGrant) throws HiveAuthzPluginE */ public Collection findMissingPrivs(RequiredPrivileges availPrivs) { MissingPrivilegeCapturer missingPrivCapturer = new MissingPrivilegeCapturer(); + if(availPrivs == null ){ + availPrivs = new RequiredPrivileges(); //create an empty priv set + } if(availPrivs.privilegeGrantSet.contains(SQLPrivTypeGrant.ADMIN_PRIV)){ //you are an admin! You have all privileges, no missing privileges @@ -72,7 +75,7 @@ public void addPrivilege(String priv, boolean withGrant) throws HiveAuthzPluginE return missingPrivCapturer.getMissingPrivileges(); } - void addPrivilege(SQLPrivTypeGrant requiredPriv) { + public void addPrivilege(SQLPrivTypeGrant requiredPriv) { privilegeGrantSet.add(requiredPriv); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLAuthorizationUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLAuthorizationUtils.java index 4a9149f..c59b403 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLAuthorizationUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLAuthorizationUtils.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -28,6 +29,12 @@ import java.util.Map; import java.util.Set; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.permission.FsAction; +import org.apache.hadoop.hive.common.FileUtils; +import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.IMetaStoreClient; import org.apache.hadoop.hive.metastore.api.HiveObjectPrivilege; import org.apache.hadoop.hive.metastore.api.HiveObjectRef; @@ -323,5 +330,42 @@ public static void assertNoMissingPrivilege(Collection missing } } + /** + * Map permissions for this uri to SQL Standard privileges + * @param filePath + * @param conf + * @param userName + * @return + * @throws HiveAuthzPluginException + */ + public static RequiredPrivileges getPrivilegesFromFS(Path filePath, HiveConf conf, + String userName) throws HiveAuthzPluginException { + // get the 'available privileges' from file system + + + RequiredPrivileges availPrivs = new RequiredPrivileges(); + // check file system permission + FileSystem fs; + try { + fs = FileSystem.get(filePath.toUri(), conf); + Path path = FileUtils.getPathOrParentThatExists(fs, filePath); + FileStatus fileStatus = fs.getFileStatus(path); + if (FileUtils.isOwnerOfFileHierarchy(fs, fileStatus, userName)) { + availPrivs.addPrivilege(SQLPrivTypeGrant.OWNER_PRIV); + } + if (FileUtils.isActionPermittedForFileHierarchy(fs, fileStatus, userName, FsAction.WRITE)) { + availPrivs.addPrivilege(SQLPrivTypeGrant.INSERT_NOGRANT); + availPrivs.addPrivilege(SQLPrivTypeGrant.DELETE_NOGRANT); + } + if (FileUtils.isActionPermittedForFileHierarchy(fs, fileStatus, userName, FsAction.READ)) { + availPrivs.addPrivilege(SQLPrivTypeGrant.SELECT_NOGRANT); + } + } catch (IOException e) { + String msg = "Error getting permissions for " + filePath + ": " + e.getMessage(); + throw new HiveAuthzPluginException(msg, e); + } + return availPrivs; + } + } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java index 40461f7..7bb5a88 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java @@ -22,6 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.HiveMetaStore; import org.apache.hadoop.hive.metastore.IMetaStoreClient; @@ -78,32 +79,35 @@ public void checkPrivileges(HiveOperationType hiveOpType, List hObjs, IMetaStoreClient metastoreClient, String userName) - throws HiveAuthzPluginException, HiveAccessControlException { + private void checkPrivileges(SQLPrivTypeGrant[] reqPrivs, List hObjs, + IMetaStoreClient metastoreClient, String userName) throws HiveAuthzPluginException, + HiveAccessControlException { RequiredPrivileges requiredInpPrivs = new RequiredPrivileges(); requiredInpPrivs.addAll(reqPrivs); // check if this user has these privileges on the objects for (HivePrivilegeObject hObj : hObjs) { - if (hObj.getType() == HivePrivilegeObjectType.LOCAL_URI) { - - } else if (hObj.getType() == HivePrivilegeObjectType.DFS_URI) { + RequiredPrivileges availPrivs = null; + if (hObj.getType() == HivePrivilegeObjectType.LOCAL_URI + || hObj.getType() == HivePrivilegeObjectType.DFS_URI) { + availPrivs = SQLAuthorizationUtils.getPrivilegesFromFS(new Path(hObj.getTableViewURI()), + conf, userName); } else if (hObj.getType() == HivePrivilegeObjectType.PARTITION) { - // sql std authorization is managing privileges at the table/view levels only + // sql std authorization is managing privileges at the table/view levels + // only // ignore partitions } else { // get the privileges that this user has on the object - RequiredPrivileges availPrivs = SQLAuthorizationUtils.getPrivilegesFromMetaStore( - metastoreClient, userName, hObj, privController.getCurrentRoles(), - privController.isUserAdmin()); - Collection missingPriv = requiredInpPrivs - .findMissingPrivs(availPrivs); - SQLAuthorizationUtils.assertNoMissingPrivilege(missingPriv, new HivePrincipal(userName, - HivePrincipalType.USER), hObj); + availPrivs = SQLAuthorizationUtils.getPrivilegesFromMetaStore(metastoreClient, userName, + hObj, privController.getCurrentRoles(), privController.isUserAdmin()); } + Collection missingPriv = requiredInpPrivs.findMissingPrivs(availPrivs); + SQLAuthorizationUtils.assertNoMissingPrivilege(missingPriv, new HivePrincipal(userName, + HivePrincipalType.USER), hObj); + } } + } diff --git a/ql/src/test/queries/clientnegative/authorization_addpartition.q b/ql/src/test/queries/clientnegative/authorization_addpartition.q index 64d8a3d..41d96f0 100644 --- a/ql/src/test/queries/clientnegative/authorization_addpartition.q +++ b/ql/src/test/queries/clientnegative/authorization_addpartition.q @@ -2,7 +2,9 @@ set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.autho set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; set hive.security.authorization.enabled=true; +set user.name=user1; -- check add partition without insert privilege create table tpart(i int, j int) partitioned by (k string); -set user.name=user1; -alter table tpart add partition (k = 'abc') location 'file:${system:test.tmp.dir}/temp' ; + +set user.name=user2; +alter table tpart add partition (k = 'abc'); diff --git a/ql/src/test/queries/clientnegative/authorization_droppartition.q b/ql/src/test/queries/clientnegative/authorization_droppartition.q index 45ed99b..a381bba 100644 --- a/ql/src/test/queries/clientnegative/authorization_droppartition.q +++ b/ql/src/test/queries/clientnegative/authorization_droppartition.q @@ -2,8 +2,10 @@ set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.autho set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; set hive.security.authorization.enabled=true; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/authz_drop_part_1; + -- check drop partition without delete privilege create table tpart(i int, j int) partitioned by (k string); -alter table tpart add partition (k = 'abc') location 'file:${system:test.tmp.dir}/temp' ; +alter table tpart add partition (k = 'abc') location 'file:${system:test.tmp.dir}/authz_drop_part_1' ; set user.name=user1; alter table tpart drop partition (k = 'abc'); diff --git a/ql/src/test/queries/clientnegative/authorization_uri_add_partition.q b/ql/src/test/queries/clientnegative/authorization_uri_add_partition.q new file mode 100644 index 0000000..45a436f --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_add_partition.q @@ -0,0 +1,10 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/a_uri_add_part; +dfs -touchz ${system:test.tmp.dir}/a_uri_add_part/1.txt; +dfs -chmod 555 ${system:test.tmp.dir}/a_uri_add_part/1.txt; + +create table tpart(i int, j int) partitioned by (k string); +alter table tpart add partition (k = 'abc') location '${system:test.tmp.dir}/a_uri_add_part/'; diff --git a/ql/src/test/queries/clientnegative/authorization_uri_alterpart_loc.q b/ql/src/test/queries/clientnegative/authorization_uri_alterpart_loc.q new file mode 100644 index 0000000..12e6e8c --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_alterpart_loc.q @@ -0,0 +1,16 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_alterpart_loc_perm; +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_alterpart_loc; +dfs -touchz ${system:test.tmp.dir}/az_uri_alterpart_loc/1.txt; +dfs -chmod 555 ${system:test.tmp.dir}/az_uri_alterpart_loc/1.txt; + +create table tpart(i int, j int) partitioned by (k string); +alter table tpart add partition (k = 'abc') location '${system:test.tmp.dir}/az_uri_alterpart_loc_perm/'; + +alter table tpart partition (k = 'abc') set location '${system:test.tmp.dir}/az_uri_alterpart_loc/'; + + +-- Attempt to set partition to location without permissions should fail diff --git a/ql/src/test/queries/clientnegative/authorization_uri_altertab_setloc.q b/ql/src/test/queries/clientnegative/authorization_uri_altertab_setloc.q new file mode 100644 index 0000000..e5e6b9c --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_altertab_setloc.q @@ -0,0 +1,13 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_altertab_setloc; +dfs -touchz ${system:test.tmp.dir}/az_uri_altertab_setloc/1.txt; +dfs -chmod 555 ${system:test.tmp.dir}/az_uri_altertab_setloc/1.txt; + +create table t1(i int); + +alter table t1 set location '${system:test.tmp.dir}/az_uri_altertab_setloc/1.txt' + +-- Attempt to set location of table to a location without permissions should fail diff --git a/ql/src/test/queries/clientnegative/authorization_uri_create_table1.q b/ql/src/test/queries/clientnegative/authorization_uri_create_table1.q new file mode 100644 index 0000000..83c1086 --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_create_table1.q @@ -0,0 +1,11 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/a_uri_crtab1; +dfs -touchz ${system:test.tmp.dir}/a_uri_crtab1/1.txt; +dfs -chmod 555 ${system:test.tmp.dir}/a_uri_crtab1/1.txt; + +create table t1(i int) location '${system:test.tmp.dir}/a_uri_crtab_ext'; + +-- Attempt to create table with dir that does not have write permission should fail diff --git a/ql/src/test/queries/clientnegative/authorization_uri_create_table_ext.q b/ql/src/test/queries/clientnegative/authorization_uri_create_table_ext.q new file mode 100644 index 0000000..c4ae6f4 --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_create_table_ext.q @@ -0,0 +1,11 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/a_uri_crtab_ext; +dfs -touchz ${system:test.tmp.dir}/a_uri_crtab_ext/1.txt; +dfs -chmod 555 ${system:test.tmp.dir}/a_uri_crtab_ext/1.txt; + +create external table t1(i int) location '${system:test.tmp.dir}/a_uri_crtab_ext'; + +-- Attempt to create table with dir that does not have write permission should fail diff --git a/ql/src/test/queries/clientnegative/authorization_uri_createdb.q b/ql/src/test/queries/clientnegative/authorization_uri_createdb.q new file mode 100644 index 0000000..a278dc2 --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_createdb.q @@ -0,0 +1,12 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_createdb; +dfs -touchz ${system:test.tmp.dir}/az_uri_createdb/1.txt; +dfs -chmod 300 ${system:test.tmp.dir}/az_uri_createdb/1.txt; + +create database az_test_db location '${system:test.tmp.dir}/az_uri_createdb/'; + +-- Attempt to create db for dir without sufficient permissions should fail + diff --git a/ql/src/test/queries/clientnegative/authorization_uri_index.q b/ql/src/test/queries/clientnegative/authorization_uri_index.q new file mode 100644 index 0000000..db04d68 --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_index.q @@ -0,0 +1,13 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_index; +dfs -touchz ${system:test.tmp.dir}/az_uri_index/1.txt; +dfs -chmod 555 ${system:test.tmp.dir}/az_uri_index/1.txt; + + +create table t1(i int); +create index idt1 on table t1 (i) as 'COMPACT' WITH DEFERRED REBUILD LOCATION '${system:test.tmp.dir}/az_uri_index/'; + +-- Attempt to use location for index that does not have permissions should fail diff --git a/ql/src/test/queries/clientnegative/authorization_uri_insert.q b/ql/src/test/queries/clientnegative/authorization_uri_insert.q new file mode 100644 index 0000000..53abe43 --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_insert.q @@ -0,0 +1,14 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_insert; +dfs -touchz ${system:test.tmp.dir}/az_uri_insert/1.txt; +dfs -chmod 555 ${system:test.tmp.dir}/az_uri_insert/1.txt; + +create table t1(i int, j int); + +insert overwrite directory '${system:test.tmp.dir}/az_uri_insert/' select * from t1; + +-- Attempt to insert into uri without permissions should fail + diff --git a/ql/src/test/queries/clientnegative/authorization_uri_insert_local.q b/ql/src/test/queries/clientnegative/authorization_uri_insert_local.q new file mode 100644 index 0000000..1b7671d --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_insert_local.q @@ -0,0 +1,14 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_insert_local; +dfs -touchz ${system:test.tmp.dir}/az_uri_insert_local/1.txt; +dfs -chmod 555 ${system:test.tmp.dir}/az_uri_insert_local/1.txt; + +create table t1(i int, j int); + +insert overwrite local directory '${system:test.tmp.dir}/az_uri_insert_local/' select * from t1; + +-- Attempt to insert into uri without permissions should fail + diff --git a/ql/src/test/queries/clientnegative/authorization_uri_load_data.q b/ql/src/test/queries/clientnegative/authorization_uri_load_data.q new file mode 100644 index 0000000..853f55d --- /dev/null +++ b/ql/src/test/queries/clientnegative/authorization_uri_load_data.q @@ -0,0 +1,11 @@ +set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory; +set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator; +set hive.security.authorization.enabled=true; + +dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/authz_uri_load_data; +dfs -touchz ${system:test.tmp.dir}/authz_uri_load_data/1.txt; +dfs -chmod 555 ${system:test.tmp.dir}/authz_uri_load_data/1.txt; + +create table t1(i int); +load data inpath 'pfile:${system:test.tmp.dir}/authz_uri_load_data/' overwrite into table t1; + diff --git a/ql/src/test/results/clientnegative/add_partition_with_whitelist.q.out b/ql/src/test/results/clientnegative/add_partition_with_whitelist.q.out index ffb6d87..920be83 100644 --- a/ql/src/test/results/clientnegative/add_partition_with_whitelist.q.out +++ b/ql/src/test/results/clientnegative/add_partition_with_whitelist.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- This pattern matches all printable ASCII characters (disallow CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This pattern matches all printable ASCII characters (disallow unicode) and disallows commas CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_whitelist_test PREHOOK: query: SHOW PARTITIONS part_whitelist_test PREHOOK: type: SHOWPARTITIONS @@ -13,5 +15,5 @@ POSTHOOK: query: SHOW PARTITIONS part_whitelist_test POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE part_whitelist_test ADD PARTITION (ds='1,2,3,4') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@part_whitelist_test +PREHOOK: Output: default@part_whitelist_test FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. MetaException(message:Partition value '1,2,3,4' contains a character not matched by whitelist pattern '[\\x20-\\x7E&&[^,]]*'. (configure with hive.metastore.partition.name.whitelist.pattern)) diff --git a/ql/src/test/results/clientnegative/addpart1.q.out b/ql/src/test/results/clientnegative/addpart1.q.out index e235d61..25d61da 100644 --- a/ql/src/test/results/clientnegative/addpart1.q.out +++ b/ql/src/test/results/clientnegative/addpart1.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table addpart1 (a int) partitioned by (b string, c string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table addpart1 (a int) partitioned by (b string, c string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@addpart1 PREHOOK: query: alter table addpart1 add partition (b='f', c='s') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@addpart1 +PREHOOK: Output: default@addpart1 POSTHOOK: query: alter table addpart1 add partition (b='f', c='s') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@addpart1 +POSTHOOK: Output: default@addpart1 POSTHOOK: Output: default@addpart1@b=f/c=s PREHOOK: query: show partitions addpart1 PREHOOK: type: SHOWPARTITIONS @@ -17,5 +19,5 @@ POSTHOOK: type: SHOWPARTITIONS b=f/c=s PREHOOK: query: alter table addpart1 add partition (b='f', c='') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@addpart1 +PREHOOK: Output: default@addpart1 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. partition spec is invalid; field c does not exist or is empty diff --git a/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out b/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out index 1fcb213..500d45d 100644 --- a/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out +++ b/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out @@ -1,25 +1,33 @@ PREHOOK: query: create table src_rc_concatenate_test(key int, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_rc_concatenate_test(key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_rc_concatenate_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_concatenate_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_concatenate_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_concatenate_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_concatenate_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_concatenate_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_concatenate_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_concatenate_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_concatenate_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_concatenate_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_concatenate_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_concatenate_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_concatenate_test PREHOOK: query: show table extended like `src_rc_concatenate_test` PREHOOK: type: SHOW_TABLESTATUS diff --git a/ql/src/test/results/clientnegative/alter_non_native.q.out b/ql/src/test/results/clientnegative/alter_non_native.q.out index 7872d15..f377d56 100644 --- a/ql/src/test/results/clientnegative/alter_non_native.q.out +++ b/ql/src/test/results/clientnegative/alter_non_native.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE non_native1(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE non_native1(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@non_native1 FAILED: SemanticException [Error 10134]: ALTER TABLE cannot be used for a non-native table non_native1 diff --git a/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out b/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out index c8f4021..ed36d5d 100644 --- a/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out +++ b/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- create testing table create table alter_coltype(key string, value string) partitioned by (dt string, ts string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- create testing table create table alter_coltype(key string, value string) partitioned by (dt string, ts string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_coltype PREHOOK: query: -- insert and create a partition insert overwrite table alter_coltype partition(dt='100x', ts='6:30pm') select * from src1 diff --git a/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out b/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out index 2d0837f..c6913b9 100644 --- a/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out +++ b/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- create testing table create table alter_coltype(key string, value string) partitioned by (dt string, ts string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- create testing table create table alter_coltype(key string, value string) partitioned by (dt string, ts string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_coltype PREHOOK: query: -- insert and create a partition insert overwrite table alter_coltype partition(dt='100x', ts='6:30pm') select * from src1 diff --git a/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out b/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out index a6deaee..740982c 100644 --- a/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out +++ b/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- create testing table create table alter_coltype(key string, value string) partitioned by (dt string, ts string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- create testing table create table alter_coltype(key string, value string) partitioned by (dt string, ts string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_coltype PREHOOK: query: -- insert and create a partition insert overwrite table alter_coltype partition(dt='100x', ts='6:30pm') select * from src1 diff --git a/ql/src/test/results/clientnegative/alter_partition_invalidspec.q.out b/ql/src/test/results/clientnegative/alter_partition_invalidspec.q.out index d16123c..3948deb 100644 --- a/ql/src/test/results/clientnegative/alter_partition_invalidspec.q.out +++ b/ql/src/test/results/clientnegative/alter_partition_invalidspec.q.out @@ -1,24 +1,30 @@ PREHOOK: query: -- Create table create table if not exists alter_part_invalidspec(key string, value string ) partitioned by (year string, month string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create table create table if not exists alter_part_invalidspec(key string, value string ) partitioned by (year string, month string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_part_invalidspec PREHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_invalidspec partition (year='1996', month='10') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_invalidspec POSTHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_invalidspec partition (year='1996', month='10') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_invalidspec POSTHOOK: Output: default@alter_part_invalidspec@year=1996/month=10 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_invalidspec partition (year='1996', month='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_invalidspec POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_invalidspec partition (year='1996', month='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_invalidspec POSTHOOK: Output: default@alter_part_invalidspec@year=1996/month=12 FAILED: SemanticException [Error 10006]: Partition not found {year=1997} diff --git a/ql/src/test/results/clientnegative/alter_partition_nodrop.q.out b/ql/src/test/results/clientnegative/alter_partition_nodrop.q.out index 6580190..8e34126 100644 --- a/ql/src/test/results/clientnegative/alter_partition_nodrop.q.out +++ b/ql/src/test/results/clientnegative/alter_partition_nodrop.q.out @@ -1,24 +1,30 @@ PREHOOK: query: -- Create table create table if not exists alter_part_nodrop_part(key string, value string ) partitioned by (year string, month string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create table create table if not exists alter_part_nodrop_part(key string, value string ) partitioned by (year string, month string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_part_nodrop_part PREHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_part partition (year='1996', month='10') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_nodrop_part POSTHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_part partition (year='1996', month='10') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_nodrop_part POSTHOOK: Output: default@alter_part_nodrop_part@year=1996/month=10 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_part partition (year='1996', month='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_nodrop_part POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_part partition (year='1996', month='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_nodrop_part POSTHOOK: Output: default@alter_part_nodrop_part@year=1996/month=12 PREHOOK: query: alter table alter_part_nodrop_part partition (year='1996') enable no_drop diff --git a/ql/src/test/results/clientnegative/alter_partition_nodrop_table.q.out b/ql/src/test/results/clientnegative/alter_partition_nodrop_table.q.out index 742031e..64705a5 100644 --- a/ql/src/test/results/clientnegative/alter_partition_nodrop_table.q.out +++ b/ql/src/test/results/clientnegative/alter_partition_nodrop_table.q.out @@ -1,24 +1,30 @@ PREHOOK: query: -- Create table create table if not exists alter_part_nodrop_table(key string, value string ) partitioned by (year string, month string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create table create table if not exists alter_part_nodrop_table(key string, value string ) partitioned by (year string, month string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_part_nodrop_table PREHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_table partition (year='1996', month='10') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_nodrop_table POSTHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_table partition (year='1996', month='10') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_nodrop_table POSTHOOK: Output: default@alter_part_nodrop_table@year=1996/month=10 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_table partition (year='1996', month='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_nodrop_table POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_table partition (year='1996', month='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_nodrop_table POSTHOOK: Output: default@alter_part_nodrop_table@year=1996/month=12 PREHOOK: query: alter table alter_part_nodrop_table partition (year='1996') enable no_drop diff --git a/ql/src/test/results/clientnegative/alter_partition_offline.q.out b/ql/src/test/results/clientnegative/alter_partition_offline.q.out index 7a14bf2..29b094d 100644 --- a/ql/src/test/results/clientnegative/alter_partition_offline.q.out +++ b/ql/src/test/results/clientnegative/alter_partition_offline.q.out @@ -1,24 +1,30 @@ PREHOOK: query: -- create table create table if not exists alter_part_offline (key string, value string ) partitioned by (year string, month string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- create table create table if not exists alter_part_offline (key string, value string ) partitioned by (year string, month string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_part_offline PREHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_offline partition (year='1996', month='10') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_offline POSTHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_offline partition (year='1996', month='10') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_offline POSTHOOK: Output: default@alter_part_offline@year=1996/month=10 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_offline partition (year='1996', month='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_offline POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_offline partition (year='1996', month='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_offline POSTHOOK: Output: default@alter_part_offline@year=1996/month=12 PREHOOK: query: alter table alter_part_offline partition (year='1996') disable offline diff --git a/ql/src/test/results/clientnegative/alter_partition_with_whitelist.q.out b/ql/src/test/results/clientnegative/alter_partition_with_whitelist.q.out index aa1fbcd..08b85b6 100644 --- a/ql/src/test/results/clientnegative/alter_partition_with_whitelist.q.out +++ b/ql/src/test/results/clientnegative/alter_partition_with_whitelist.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- This pattern matches all printable ASCII characters (disallow CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This pattern matches all printable ASCII characters (disallow unicode) and disallows commas CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_whitelist_test PREHOOK: query: SHOW PARTITIONS part_whitelist_test PREHOOK: type: SHOWPARTITIONS @@ -13,10 +15,10 @@ POSTHOOK: query: SHOW PARTITIONS part_whitelist_test POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE part_whitelist_test ADD PARTITION (ds='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@part_whitelist_test +PREHOOK: Output: default@part_whitelist_test POSTHOOK: query: ALTER TABLE part_whitelist_test ADD PARTITION (ds='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@part_whitelist_test +POSTHOOK: Output: default@part_whitelist_test POSTHOOK: Output: default@part_whitelist_test@ds=1 PREHOOK: query: ALTER TABLE part_whitelist_test PARTITION (ds='1') rename to partition (ds='1,2,3') PREHOOK: type: ALTERTABLE_RENAMEPART diff --git a/ql/src/test/results/clientnegative/alter_rename_partition_failure.q.out b/ql/src/test/results/clientnegative/alter_rename_partition_failure.q.out index 1ba491e..319c065 100644 --- a/ql/src/test/results/clientnegative/alter_rename_partition_failure.q.out +++ b/ql/src/test/results/clientnegative/alter_rename_partition_failure.q.out @@ -1,18 +1,24 @@ PREHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_rename_partition_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_rename_partition_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_rename_partition_src PREHOOK: query: create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_rename_partition PREHOOK: query: insert overwrite table alter_rename_partition partition (pCol1='old_part1:', pcol2='old_part2:') select col1 from alter_rename_partition_src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/alter_rename_partition_failure2.q.out b/ql/src/test/results/clientnegative/alter_rename_partition_failure2.q.out index 743a3ea..37fddb9 100644 --- a/ql/src/test/results/clientnegative/alter_rename_partition_failure2.q.out +++ b/ql/src/test/results/clientnegative/alter_rename_partition_failure2.q.out @@ -1,18 +1,24 @@ PREHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_rename_partition_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_rename_partition_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_rename_partition_src PREHOOK: query: create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_rename_partition PREHOOK: query: insert overwrite table alter_rename_partition partition (pCol1='old_part1:', pcol2='old_part2:') select col1 from alter_rename_partition_src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/alter_rename_partition_failure3.q.out b/ql/src/test/results/clientnegative/alter_rename_partition_failure3.q.out index 458b3d6..95b02ec 100644 --- a/ql/src/test/results/clientnegative/alter_rename_partition_failure3.q.out +++ b/ql/src/test/results/clientnegative/alter_rename_partition_failure3.q.out @@ -1,18 +1,24 @@ PREHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_rename_partition_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_rename_partition_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_rename_partition_src PREHOOK: query: create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_rename_partition PREHOOK: query: insert overwrite table alter_rename_partition partition (pCol1='old_part1:', pcol2='old_part2:') select col1 from alter_rename_partition_src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/alter_table_add_partition.q.out b/ql/src/test/results/clientnegative/alter_table_add_partition.q.out index 79b2590..2a5b9b0 100644 --- a/ql/src/test/results/clientnegative/alter_table_add_partition.q.out +++ b/ql/src/test/results/clientnegative/alter_table_add_partition.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table mp (a int) partitioned by (b int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table mp (a int) partitioned by (b int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mp FAILED: SemanticException Partition spec {b=1, c=1} contains non-partition columns diff --git a/ql/src/test/results/clientnegative/alter_table_wrong_regex.q.out b/ql/src/test/results/clientnegative/alter_table_wrong_regex.q.out index f7d3b36..83a1e6b 100644 --- a/ql/src/test/results/clientnegative/alter_table_wrong_regex.q.out +++ b/ql/src/test/results/clientnegative/alter_table_wrong_regex.q.out @@ -6,10 +6,12 @@ PREHOOK: query: create table aa ( test STRING ) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.RegexSerDe' WITH SERDEPROPERTIES ("input.regex" = "(.*)", "output.format.string" = "$1s") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table aa ( test STRING ) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.RegexSerDe' WITH SERDEPROPERTIES ("input.regex" = "(.*)", "output.format.string" = "$1s") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@aa PREHOOK: query: alter table aa set serdeproperties ("input.regex" = "[^\\](.*)", "output.format.string" = "$1s") PREHOOK: type: ALTERTABLE_SERDEPROPERTIES diff --git a/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out b/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out index ddc3496..e4c2071 100644 --- a/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out +++ b/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out @@ -18,11 +18,13 @@ ADD PARTITION (value='val_86') PARTITION (value='val_xyz') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@src PREHOOK: Input: default@testviewpart +PREHOOK: Output: default@testviewpart POSTHOOK: query: ALTER VIEW testViewPart ADD PARTITION (value='val_86') PARTITION (value='val_xyz') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@src POSTHOOK: Input: default@testviewpart +POSTHOOK: Output: default@testviewpart POSTHOOK: Output: default@testviewpart@value=val_86 POSTHOOK: Output: default@testviewpart@value=val_xyz PREHOOK: query: DESCRIBE FORMATTED testViewPart diff --git a/ql/src/test/results/clientnegative/alter_view_failure8.q.out b/ql/src/test/results/clientnegative/alter_view_failure8.q.out index 3138894..d3c9819 100644 --- a/ql/src/test/results/clientnegative/alter_view_failure8.q.out +++ b/ql/src/test/results/clientnegative/alter_view_failure8.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- should fail: can't use ALTER VIEW on a table CREATE TABLE invites (foo INT, bar STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- should fail: can't use ALTER VIEW on a table CREATE TABLE invites (foo INT, bar STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@invites FAILED: SemanticException [Error 10132]: To alter a base table you need to use the ALTER TABLE command. diff --git a/ql/src/test/results/clientnegative/altern1.q.out b/ql/src/test/results/clientnegative/altern1.q.out index 73f8ad8..75e097b 100644 --- a/ql/src/test/results/clientnegative/altern1.q.out +++ b/ql/src/test/results/clientnegative/altern1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table altern1(a int, b int) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table altern1(a int, b int) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@altern1 PREHOOK: query: alter table altern1 replace columns(a int, b int, ds string) PREHOOK: type: ALTERTABLE_REPLACECOLS diff --git a/ql/src/test/results/clientnegative/archive1.q.out b/ql/src/test/results/clientnegative/archive1.q.out index 4daeaba..db0240b 100644 --- a/ql/src/test/results/clientnegative/archive1.q.out +++ b/ql/src/test/results/clientnegative/archive1.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive a partition twice. CREATE TABLE srcpart_archived LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive a partition twice. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE srcpart_archived LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_archived PREHOOK: query: INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/archive2.q.out b/ql/src/test/results/clientnegative/archive2.q.out index 21ba836..1e51d41 100644 --- a/ql/src/test/results/clientnegative/archive2.q.out +++ b/ql/src/test/results/clientnegative/archive2.q.out @@ -10,8 +10,10 @@ drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='12') select key, value from srcpart where ds='2008-04-08' and hr='12' diff --git a/ql/src/test/results/clientnegative/archive_corrupt.q.out b/ql/src/test/results/clientnegative/archive_corrupt.q.out index a3f3cb0..60c2d57 100644 --- a/ql/src/test/results/clientnegative/archive_corrupt.q.out +++ b/ql/src/test/results/clientnegative/archive_corrupt.q.out @@ -8,8 +8,10 @@ POSTHOOK: query: drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20) -- The version of GzipCodec that is provided in Hadoop 0.20 silently ignores @@ -20,6 +22,7 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20) load data local inpath '../../data/files/archive_corrupt.rc' overwrite into table tstsrcpart partition (ds='2008-04-08', hr='11') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstsrcpart Failed with exception Wrong file format. Please check the file's format. FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.MoveTask diff --git a/ql/src/test/results/clientnegative/archive_insert1.q.out b/ql/src/test/results/clientnegative/archive_insert1.q.out index e8548e6..1b2405f 100644 --- a/ql/src/test/results/clientnegative/archive_insert1.q.out +++ b/ql/src/test/results/clientnegative/archive_insert1.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to insert into archived partition. CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to insert into archived partition. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/archive_insert2.q.out b/ql/src/test/results/clientnegative/archive_insert2.q.out index bb829f8..d6b9723 100644 --- a/ql/src/test/results/clientnegative/archive_insert2.q.out +++ b/ql/src/test/results/clientnegative/archive_insert2.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to insert into archived partition. CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to insert into archived partition. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/archive_insert3.q.out b/ql/src/test/results/clientnegative/archive_insert3.q.out index 7c1c6f5..d0d3041 100644 --- a/ql/src/test/results/clientnegative/archive_insert3.q.out +++ b/ql/src/test/results/clientnegative/archive_insert3.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to create partition inside of archived directory CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to create partition inside of archived directory. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/archive_insert4.q.out b/ql/src/test/results/clientnegative/archive_insert4.q.out index 0fb1dc9..d957988 100644 --- a/ql/src/test/results/clientnegative/archive_insert4.q.out +++ b/ql/src/test/results/clientnegative/archive_insert4.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to (possible) dynamic insert into archived parti CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to (possible) dynamic insert into archived partition. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/archive_multi1.q.out b/ql/src/test/results/clientnegative/archive_multi1.q.out index 52e2125..605d8bf 100644 --- a/ql/src/test/results/clientnegative/archive_multi1.q.out +++ b/ql/src/test/results/clientnegative/archive_multi1.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive a partition twice. CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive a partition twice. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11' diff --git a/ql/src/test/results/clientnegative/archive_multi2.q.out b/ql/src/test/results/clientnegative/archive_multi2.q.out index 163d978..0edcf44 100644 --- a/ql/src/test/results/clientnegative/archive_multi2.q.out +++ b/ql/src/test/results/clientnegative/archive_multi2.q.out @@ -10,8 +10,10 @@ drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11' diff --git a/ql/src/test/results/clientnegative/archive_multi3.q.out b/ql/src/test/results/clientnegative/archive_multi3.q.out index 6e21a76..241f02c 100644 --- a/ql/src/test/results/clientnegative/archive_multi3.q.out +++ b/ql/src/test/results/clientnegative/archive_multi3.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive outer partition group containing othe CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive outer partition group containing other partition inside. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11' diff --git a/ql/src/test/results/clientnegative/archive_multi4.q.out b/ql/src/test/results/clientnegative/archive_multi4.q.out index 2d41343..a092645 100644 --- a/ql/src/test/results/clientnegative/archive_multi4.q.out +++ b/ql/src/test/results/clientnegative/archive_multi4.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive inner partition contained in archived CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive inner partition contained in archived partition group. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11' diff --git a/ql/src/test/results/clientnegative/archive_multi5.q.out b/ql/src/test/results/clientnegative/archive_multi5.q.out index 0f9a6e1..0855c31 100644 --- a/ql/src/test/results/clientnegative/archive_multi5.q.out +++ b/ql/src/test/results/clientnegative/archive_multi5.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to unarchive outer partition group containing ot CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to unarchive outer partition group containing other partition inside. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11' diff --git a/ql/src/test/results/clientnegative/archive_multi6.q.out b/ql/src/test/results/clientnegative/archive_multi6.q.out index cba6d3e..9c44064 100644 --- a/ql/src/test/results/clientnegative/archive_multi6.q.out +++ b/ql/src/test/results/clientnegative/archive_multi6.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to unarchive inner partition contained in archiv CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to unarchive inner partition contained in archived partition group. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11' diff --git a/ql/src/test/results/clientnegative/archive_multi7.q.out b/ql/src/test/results/clientnegative/archive_multi7.q.out index 74c0b9c..a8eee2f 100644 --- a/ql/src/test/results/clientnegative/archive_multi7.q.out +++ b/ql/src/test/results/clientnegative/archive_multi7.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive a partition group with custom locatio CREATE TABLE tstsrcpart LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive a partition group with custom locations. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE tstsrcpart LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11' @@ -26,11 +28,13 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcp PREHOOK: query: ALTER TABLE tstsrcpart ADD PARTITION (ds='2008-04-08', hr='12') #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tstsrcpart +#### A masked pattern was here #### +PREHOOK: Output: default@tstsrcpart POSTHOOK: query: ALTER TABLE tstsrcpart ADD PARTITION (ds='2008-04-08', hr='12') #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tstsrcpart +#### A masked pattern was here #### +POSTHOOK: Output: default@tstsrcpart POSTHOOK: Output: default@tstsrcpart@ds=2008-04-08/hr=12 POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientnegative/archive_partspec1.q.out b/ql/src/test/results/clientnegative/archive_partspec1.q.out index 57a2f26..831fab9 100644 --- a/ql/src/test/results/clientnegative/archive_partspec1.q.out +++ b/ql/src/test/results/clientnegative/archive_partspec1.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive a partition twice. CREATE TABLE srcpart_archived LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive a partition twice. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE srcpart_archived LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_archived PREHOOK: query: INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/archive_partspec2.q.out b/ql/src/test/results/clientnegative/archive_partspec2.q.out index 43bbd30..77cd7a7 100644 --- a/ql/src/test/results/clientnegative/archive_partspec2.q.out +++ b/ql/src/test/results/clientnegative/archive_partspec2.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive a partition twice. CREATE TABLE srcpart_archived LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive a partition twice. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE srcpart_archived LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_archived PREHOOK: query: INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/archive_partspec3.q.out b/ql/src/test/results/clientnegative/archive_partspec3.q.out index c85e9a2..e357a33 100644 --- a/ql/src/test/results/clientnegative/archive_partspec3.q.out +++ b/ql/src/test/results/clientnegative/archive_partspec3.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive a partition twice. CREATE TABLE srcpart_archived LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive a partition twice. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE srcpart_archived LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_archived PREHOOK: query: INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/archive_partspec4.q.out b/ql/src/test/results/clientnegative/archive_partspec4.q.out index 6b7f77d..f39c267 100644 --- a/ql/src/test/results/clientnegative/archive_partspec4.q.out +++ b/ql/src/test/results/clientnegative/archive_partspec4.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive a partition twice. CREATE TABLE srcpart_archived LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive a partition twice. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE srcpart_archived LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_archived PREHOOK: query: INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/archive_partspec5.q.out b/ql/src/test/results/clientnegative/archive_partspec5.q.out index a2c9e09..1cb2928 100644 --- a/ql/src/test/results/clientnegative/archive_partspec5.q.out +++ b/ql/src/test/results/clientnegative/archive_partspec5.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests trying to archive a partition twice. CREATE TABLE srcpart_archived (key string, value string) partitioned by (ds string, hr int, min int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests trying to archive a partition twice. -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) CREATE TABLE srcpart_archived (key string, value string) partitioned by (ds string, hr int, min int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_archived PREHOOK: query: INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12', min='00') SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12' diff --git a/ql/src/test/results/clientnegative/authorization_addpartition.q.out b/ql/src/test/results/clientnegative/authorization_addpartition.q.out index f4d3b4f..6331ae2 100644 --- a/ql/src/test/results/clientnegative/authorization_addpartition.q.out +++ b/ql/src/test/results/clientnegative/authorization_addpartition.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- check add partition without insert privilege create table tpart(i int, j int) partitioned by (k string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check add partition without insert privilege create table tpart(i int, j int) partitioned by (k string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tpart -FAILED: HiveAccessControlException Permission denied. Principal [name=user1, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.tpart] : [INSERT] +FAILED: HiveAccessControlException Permission denied. Principal [name=user2, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.tpart] : [INSERT] diff --git a/ql/src/test/results/clientnegative/authorization_createview.q.out b/ql/src/test/results/clientnegative/authorization_createview.q.out index cb81b83..c86bdfa 100644 --- a/ql/src/test/results/clientnegative/authorization_createview.q.out +++ b/ql/src/test/results/clientnegative/authorization_createview.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- check create view without select privileges create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check create view without select privileges create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 FAILED: HiveAccessControlException Permission denied. Principal [name=user1, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.t1] : [SELECT with grant] diff --git a/ql/src/test/results/clientnegative/authorization_ctas.q.out b/ql/src/test/results/clientnegative/authorization_ctas.q.out index 1070468..f8395b7 100644 --- a/ql/src/test/results/clientnegative/authorization_ctas.q.out +++ b/ql/src/test/results/clientnegative/authorization_ctas.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- check query without select privilege fails create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check query without select privilege fails create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 FAILED: HiveAccessControlException Permission denied. Principal [name=user1, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.t1] : [SELECT] diff --git a/ql/src/test/results/clientnegative/authorization_droppartition.q.out b/ql/src/test/results/clientnegative/authorization_droppartition.q.out index 7de553b..1da250a 100644 --- a/ql/src/test/results/clientnegative/authorization_droppartition.q.out +++ b/ql/src/test/results/clientnegative/authorization_droppartition.q.out @@ -1,15 +1,19 @@ PREHOOK: query: -- check drop partition without delete privilege create table tpart(i int, j int) partitioned by (k string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check drop partition without delete privilege create table tpart(i int, j int) partitioned by (k string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tpart #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tpart +#### A masked pattern was here #### +PREHOOK: Output: default@tpart #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tpart +#### A masked pattern was here #### +POSTHOOK: Output: default@tpart POSTHOOK: Output: default@tpart@k=abc FAILED: HiveAccessControlException Permission denied. Principal [name=user1, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.tpart] : [DELETE] diff --git a/ql/src/test/results/clientnegative/authorization_fail_1.q.out b/ql/src/test/results/clientnegative/authorization_fail_1.q.out index ab1abe2..7af4ae8 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_1.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table authorization_fail_1 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table authorization_fail_1 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_fail_1 PREHOOK: query: grant Create on table authorization_fail_1 to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE diff --git a/ql/src/test/results/clientnegative/authorization_fail_2.q.out b/ql/src/test/results/clientnegative/authorization_fail_2.q.out index 2c03b65..b2aadb7 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_2.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_2.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table authorization_fail_2 (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table authorization_fail_2 (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_fail_2 -Authorization failed:No privilege 'Create' found for inputs { database:default, table:authorization_fail_2}. Use SHOW GRANT to get more details. +Authorization failed:No privilege 'Create' found for outputs { database:default, table:authorization_fail_2}. Use SHOW GRANT to get more details. diff --git a/ql/src/test/results/clientnegative/authorization_fail_3.q.out b/ql/src/test/results/clientnegative/authorization_fail_3.q.out index bfba08a..d3b2a7c 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_3.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_3.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table authorization_fail_3 (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- SORT_BEFORE_DIFF create table authorization_fail_3 (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_fail_3 PREHOOK: query: grant Create on table authorization_fail_3 to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE @@ -15,10 +17,10 @@ POSTHOOK: type: GRANT_PRIVILEGE POSTHOOK: Output: default@authorization_fail_3 PREHOOK: query: alter table authorization_fail_3 add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@authorization_fail_3 +PREHOOK: Output: default@authorization_fail_3 POSTHOOK: query: alter table authorization_fail_3 add partition (ds='2010') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@authorization_fail_3 +POSTHOOK: Output: default@authorization_fail_3 POSTHOOK: Output: default@authorization_fail_3@ds=2010 PREHOOK: query: show grant user hive_test_user on table authorization_fail_3 PREHOOK: type: SHOW_GRANT diff --git a/ql/src/test/results/clientnegative/authorization_fail_4.q.out b/ql/src/test/results/clientnegative/authorization_fail_4.q.out index 34ad4ef..3ce149b 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_4.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_4.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table authorization_fail_4 (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- SORT_BEFORE_DIFF create table authorization_fail_4 (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_fail_4 PREHOOK: query: grant Alter on table authorization_fail_4 to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE @@ -29,10 +31,10 @@ POSTHOOK: type: GRANT_PRIVILEGE POSTHOOK: Output: default@authorization_fail_4 PREHOOK: query: alter table authorization_fail_4 add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@authorization_fail_4 +PREHOOK: Output: default@authorization_fail_4 POSTHOOK: query: alter table authorization_fail_4 add partition (ds='2010') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@authorization_fail_4 +POSTHOOK: Output: default@authorization_fail_4 POSTHOOK: Output: default@authorization_fail_4@ds=2010 PREHOOK: query: show grant user hive_test_user on table authorization_fail_4 PREHOOK: type: SHOW_GRANT diff --git a/ql/src/test/results/clientnegative/authorization_fail_5.q.out b/ql/src/test/results/clientnegative/authorization_fail_5.q.out index a0289fb..72b074f 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_5.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_5.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table authorization_fail (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- SORT_BEFORE_DIFF create table authorization_fail (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_fail PREHOOK: query: grant Alter on table authorization_fail to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE @@ -35,10 +37,10 @@ POSTHOOK: type: GRANT_PRIVILEGE POSTHOOK: Output: default@authorization_fail PREHOOK: query: alter table authorization_fail add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@authorization_fail +PREHOOK: Output: default@authorization_fail POSTHOOK: query: alter table authorization_fail add partition (ds='2010') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@authorization_fail +POSTHOOK: Output: default@authorization_fail POSTHOOK: Output: default@authorization_fail@ds=2010 PREHOOK: query: show grant user hive_test_user on table authorization_fail PREHOOK: type: SHOW_GRANT diff --git a/ql/src/test/results/clientnegative/authorization_fail_6.q.out b/ql/src/test/results/clientnegative/authorization_fail_6.q.out index 47f8bd1..9c7d80e 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_6.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_6.q.out @@ -2,9 +2,11 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table authorization_part_fail (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- SORT_BEFORE_DIFF create table authorization_part_fail (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_part_fail Authorization failed:No privilege 'Alter' found for inputs { database:default, table:authorization_part_fail}. Use SHOW GRANT to get more details. diff --git a/ql/src/test/results/clientnegative/authorization_fail_7.q.out b/ql/src/test/results/clientnegative/authorization_fail_7.q.out index a9bf0cc..00e457d 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_7.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_7.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table authorization_fail (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- SORT_BEFORE_DIFF create table authorization_fail (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_fail PREHOOK: query: create role hive_test_role_fail PREHOOK: type: CREATEROLE @@ -25,8 +27,8 @@ PREHOOK: query: show role grant user hive_test_user PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user hive_test_user POSTHOOK: type: SHOW_ROLE_GRANT -hive_test_role_fail -1 hive_test_user USER false -1 hive_test_user PUBLIC -1 false -1 +hive_test_role_fail -1 hive_test_user USER false -1 hive_test_user PREHOOK: query: show grant role hive_test_role_fail on table authorization_fail PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role hive_test_role_fail on table authorization_fail diff --git a/ql/src/test/results/clientnegative/authorization_grant_table_allpriv.q.out b/ql/src/test/results/clientnegative/authorization_grant_table_allpriv.q.out index 0e17c94..4aa7058 100644 --- a/ql/src/test/results/clientnegative/authorization_grant_table_allpriv.q.out +++ b/ql/src/test/results/clientnegative/authorization_grant_table_allpriv.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- current user has been set (comment line before the set cmd is CREATE TABLE table_priv_allf(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE table_priv_allf(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_priv_allf PREHOOK: query: -- grant insert to user2 WITH grant option GRANT INSERT ON table_priv_allf TO USER user2 with grant option diff --git a/ql/src/test/results/clientnegative/authorization_grant_table_fail1.q.out b/ql/src/test/results/clientnegative/authorization_grant_table_fail1.q.out index 0c83849..f042c1e 100644 --- a/ql/src/test/results/clientnegative/authorization_grant_table_fail1.q.out +++ b/ql/src/test/results/clientnegative/authorization_grant_table_fail1.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- current user has been set (comment line before the set cmd is CREATE TABLE table_priv_gfail1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE table_priv_gfail1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_priv_gfail1 PREHOOK: query: -- try grant insert to user3 as user2 GRANT INSERT ON table_priv_gfail1 TO USER user3 diff --git a/ql/src/test/results/clientnegative/authorization_grant_table_fail_nogrant.q.out b/ql/src/test/results/clientnegative/authorization_grant_table_fail_nogrant.q.out index 129b5fa..a906a70 100644 --- a/ql/src/test/results/clientnegative/authorization_grant_table_fail_nogrant.q.out +++ b/ql/src/test/results/clientnegative/authorization_grant_table_fail_nogrant.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- current user has been set (comment line before the set cmd is CREATE TABLE table_priv_gfail1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE table_priv_gfail1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_priv_gfail1 PREHOOK: query: -- grant insert to user2 WITHOUT grant option GRANT INSERT ON table_priv_gfail1 TO USER user2 diff --git a/ql/src/test/results/clientnegative/authorization_insert_noinspriv.q.out b/ql/src/test/results/clientnegative/authorization_insert_noinspriv.q.out index 6d510f1..ee8d49e 100644 --- a/ql/src/test/results/clientnegative/authorization_insert_noinspriv.q.out +++ b/ql/src/test/results/clientnegative/authorization_insert_noinspriv.q.out @@ -1,13 +1,17 @@ PREHOOK: query: -- check insert without select priv create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check insert without select priv create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create table user2tab(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table user2tab(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@user2tab FAILED: HiveAccessControlException Permission denied. Principal [name=user1, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.t1] : [INSERT, DELETE] diff --git a/ql/src/test/results/clientnegative/authorization_insert_noselectpriv.q.out b/ql/src/test/results/clientnegative/authorization_insert_noselectpriv.q.out index 5b9b93a..46ada3b 100644 --- a/ql/src/test/results/clientnegative/authorization_insert_noselectpriv.q.out +++ b/ql/src/test/results/clientnegative/authorization_insert_noselectpriv.q.out @@ -1,13 +1,17 @@ PREHOOK: query: -- check insert without select priv create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check insert without select priv create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create table t2(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t2(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t2 FAILED: HiveAccessControlException Permission denied. Principal [name=user1, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.t1] : [SELECT] diff --git a/ql/src/test/results/clientnegative/authorization_invalid_priv_v1.q.out b/ql/src/test/results/clientnegative/authorization_invalid_priv_v1.q.out index 10d1ca8..d1ccf03 100644 --- a/ql/src/test/results/clientnegative/authorization_invalid_priv_v1.q.out +++ b/ql/src/test/results/clientnegative/authorization_invalid_priv_v1.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table if not exists authorization_invalid_v1 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists authorization_invalid_v1 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_invalid_v1 FAILED: SemanticException Undefined privilege Delete diff --git a/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out b/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out index 62aa8da..1fb2abc 100644 --- a/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out +++ b/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table if not exists authorization_invalid_v2 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists authorization_invalid_v2 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_invalid_v2 PREHOOK: query: grant index on table authorization_invalid_v2 to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE diff --git a/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_rename.q.out b/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_rename.q.out index e41702a..8a7f2d2 100644 --- a/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_rename.q.out +++ b/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_rename.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- check if alter table fails as different user create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check if alter table fails as different user create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 FAILED: HiveAccessControlException Permission denied. Principal [name=user2, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.t1] : [OBJECT OWNERSHIP] diff --git a/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_serdeprop.q.out b/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_serdeprop.q.out index e41702a..8a7f2d2 100644 --- a/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_serdeprop.q.out +++ b/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_serdeprop.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- check if alter table fails as different user create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check if alter table fails as different user create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 FAILED: HiveAccessControlException Permission denied. Principal [name=user2, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.t1] : [OBJECT OWNERSHIP] diff --git a/ql/src/test/results/clientnegative/authorization_not_owner_drop_tab.q.out b/ql/src/test/results/clientnegative/authorization_not_owner_drop_tab.q.out index b456aca..4378b12 100644 --- a/ql/src/test/results/clientnegative/authorization_not_owner_drop_tab.q.out +++ b/ql/src/test/results/clientnegative/authorization_not_owner_drop_tab.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- check if create table fails as different user create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check if create table fails as different user create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 FAILED: HiveAccessControlException Permission denied. Principal [name=user2, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.t1] : [OBJECT OWNERSHIP] diff --git a/ql/src/test/results/clientnegative/authorization_not_owner_drop_view.q.out b/ql/src/test/results/clientnegative/authorization_not_owner_drop_view.q.out index 2433846..80378ac 100644 --- a/ql/src/test/results/clientnegative/authorization_not_owner_drop_view.q.out +++ b/ql/src/test/results/clientnegative/authorization_not_owner_drop_view.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- check if create table fails as different user create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check if create table fails as different user create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create view vt1 as select * from t1 PREHOOK: type: CREATEVIEW diff --git a/ql/src/test/results/clientnegative/authorization_part.q.out b/ql/src/test/results/clientnegative/authorization_part.q.out index 31dfda9..17720e0 100644 --- a/ql/src/test/results/clientnegative/authorization_part.q.out +++ b/ql/src/test/results/clientnegative/authorization_part.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table authorization_part_fail (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- SORT_BEFORE_DIFF create table authorization_part_fail (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_part_fail PREHOOK: query: ALTER TABLE authorization_part_fail SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE") PREHOOK: type: ALTERTABLE_PROPERTIES diff --git a/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out b/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out index f932a3d..8e2ce90 100644 --- a/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out +++ b/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out @@ -18,8 +18,10 @@ POSTHOOK: query: grant role role2 to user user2 POSTHOOK: type: GRANT_ROLE PREHOOK: query: create table tpriv_current_role(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tpriv_current_role(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tpriv_current_role PREHOOK: query: grant all on table tpriv_current_role to role role2 with grant option PREHOOK: type: GRANT_PRIVILEGE diff --git a/ql/src/test/results/clientnegative/authorization_revoke_table_fail1.q.out b/ql/src/test/results/clientnegative/authorization_revoke_table_fail1.q.out index 0f4c966..eb3abec 100644 --- a/ql/src/test/results/clientnegative/authorization_revoke_table_fail1.q.out +++ b/ql/src/test/results/clientnegative/authorization_revoke_table_fail1.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- current user has been set (comment line before the set cmd is CREATE TABLE table_priv_rfail1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE table_priv_rfail1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_priv_rfail1 PREHOOK: query: -- grant insert to user2 GRANT INSERT ON table_priv_rfail1 TO USER user2 diff --git a/ql/src/test/results/clientnegative/authorization_revoke_table_fail2.q.out b/ql/src/test/results/clientnegative/authorization_revoke_table_fail2.q.out index c671c8a..e304632 100644 --- a/ql/src/test/results/clientnegative/authorization_revoke_table_fail2.q.out +++ b/ql/src/test/results/clientnegative/authorization_revoke_table_fail2.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- current user has been set (comment line before the set cmd is CREATE TABLE table_priv_rfai2(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE table_priv_rfai2(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_priv_rfai2 PREHOOK: query: -- grant insert to user2 GRANT INSERT ON table_priv_rfai2 TO USER user2 diff --git a/ql/src/test/results/clientnegative/authorization_select.q.out b/ql/src/test/results/clientnegative/authorization_select.q.out index 1070468..f8395b7 100644 --- a/ql/src/test/results/clientnegative/authorization_select.q.out +++ b/ql/src/test/results/clientnegative/authorization_select.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- check query without select privilege fails create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check query without select privilege fails create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 FAILED: HiveAccessControlException Permission denied. Principal [name=user1, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.t1] : [SELECT] diff --git a/ql/src/test/results/clientnegative/authorization_select_view.q.out b/ql/src/test/results/clientnegative/authorization_select_view.q.out index e70a79c..f253870 100644 --- a/ql/src/test/results/clientnegative/authorization_select_view.q.out +++ b/ql/src/test/results/clientnegative/authorization_select_view.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- check create view without select privileges create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check create view without select privileges create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create view v1 as select * from t1 PREHOOK: type: CREATEVIEW diff --git a/ql/src/test/results/clientnegative/authorization_truncate.q.out b/ql/src/test/results/clientnegative/authorization_truncate.q.out index c188831..4d51bc4 100644 --- a/ql/src/test/results/clientnegative/authorization_truncate.q.out +++ b/ql/src/test/results/clientnegative/authorization_truncate.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- check add partition without insert privilege create table t1(i int, j int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- check add partition without insert privilege create table t1(i int, j int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 FAILED: HiveAccessControlException Permission denied. Principal [name=user1, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=default.t1] : [OBJECT OWNERSHIP] diff --git a/ql/src/test/results/clientnegative/authorization_uri_add_partition.q.out b/ql/src/test/results/clientnegative/authorization_uri_add_partition.q.out new file mode 100644 index 0000000..15b5bce --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_add_partition.q.out @@ -0,0 +1,8 @@ +PREHOOK: query: create table tpart(i int, j int) partitioned by (k string) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +POSTHOOK: query: create table tpart(i int, j int) partitioned by (k string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@tpart +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/authorization_uri_alterpart_loc.q.out b/ql/src/test/results/clientnegative/authorization_uri_alterpart_loc.q.out new file mode 100644 index 0000000..39a4e4f --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_alterpart_loc.q.out @@ -0,0 +1,17 @@ +PREHOOK: query: create table tpart(i int, j int) partitioned by (k string) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +POSTHOOK: query: create table tpart(i int, j int) partitioned by (k string) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@tpart +#### A masked pattern was here #### +PREHOOK: type: ALTERTABLE_ADDPARTS +#### A masked pattern was here #### +PREHOOK: Output: default@tpart +#### A masked pattern was here #### +POSTHOOK: type: ALTERTABLE_ADDPARTS +#### A masked pattern was here #### +POSTHOOK: Output: default@tpart +POSTHOOK: Output: default@tpart@k=abc +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/authorization_uri_altertab_setloc.q.out b/ql/src/test/results/clientnegative/authorization_uri_altertab_setloc.q.out new file mode 100644 index 0000000..c0adf59 --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_altertab_setloc.q.out @@ -0,0 +1,8 @@ +PREHOOK: query: create table t1(i int) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +POSTHOOK: query: create table t1(i int) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@t1 +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/authorization_uri_create_table1.q.out b/ql/src/test/results/clientnegative/authorization_uri_create_table1.q.out new file mode 100644 index 0000000..0b8182a --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_create_table1.q.out @@ -0,0 +1 @@ +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/authorization_uri_create_table_ext.q.out b/ql/src/test/results/clientnegative/authorization_uri_create_table_ext.q.out new file mode 100644 index 0000000..0b8182a --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_create_table_ext.q.out @@ -0,0 +1 @@ +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/authorization_uri_createdb.q.out b/ql/src/test/results/clientnegative/authorization_uri_createdb.q.out new file mode 100644 index 0000000..0b8182a --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_createdb.q.out @@ -0,0 +1 @@ +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/authorization_uri_index.q.out b/ql/src/test/results/clientnegative/authorization_uri_index.q.out new file mode 100644 index 0000000..c0adf59 --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_index.q.out @@ -0,0 +1,8 @@ +PREHOOK: query: create table t1(i int) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +POSTHOOK: query: create table t1(i int) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@t1 +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/authorization_uri_insert.q.out b/ql/src/test/results/clientnegative/authorization_uri_insert.q.out new file mode 100644 index 0000000..86319a3 --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_insert.q.out @@ -0,0 +1,8 @@ +PREHOOK: query: create table t1(i int, j int) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +POSTHOOK: query: create table t1(i int, j int) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@t1 +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/authorization_uri_insert_local.q.out b/ql/src/test/results/clientnegative/authorization_uri_insert_local.q.out new file mode 100644 index 0000000..86319a3 --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_insert_local.q.out @@ -0,0 +1,8 @@ +PREHOOK: query: create table t1(i int, j int) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +POSTHOOK: query: create table t1(i int, j int) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@t1 +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/authorization_uri_load_data.q.out b/ql/src/test/results/clientnegative/authorization_uri_load_data.q.out new file mode 100644 index 0000000..c0adf59 --- /dev/null +++ b/ql/src/test/results/clientnegative/authorization_uri_load_data.q.out @@ -0,0 +1,8 @@ +PREHOOK: query: create table t1(i int) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +POSTHOOK: query: create table t1(i int) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@t1 +#### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/bad_sample_clause.q.out b/ql/src/test/results/clientnegative/bad_sample_clause.q.out index bbbb5f4..ce137eb 100644 --- a/ql/src/test/results/clientnegative/bad_sample_clause.q.out +++ b/ql/src/test/results/clientnegative/bad_sample_clause.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING, dt STRING, hr STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING, dt STRING, hr STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 FAILED: SemanticException [Error 10060]: Sampling expression needed for non-bucketed table srcpart diff --git a/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out b/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out index da6dd08..6120b48 100644 --- a/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out +++ b/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out @@ -2,61 +2,75 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: -- The number of buckets in the 2 tables above (being joined later) dont match. -- Throw an error if the user requested a bucketed mapjoin to be enforced. diff --git a/ql/src/test/results/clientnegative/bucket_mapjoin_wrong_table_metadata_1.q.out b/ql/src/test/results/clientnegative/bucket_mapjoin_wrong_table_metadata_1.q.out index 80d97f9..a0d1bed 100644 --- a/ql/src/test/results/clientnegative/bucket_mapjoin_wrong_table_metadata_1.q.out +++ b/ql/src/test/results/clientnegative/bucket_mapjoin_wrong_table_metadata_1.q.out @@ -13,33 +13,43 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table table1(key string, value string) clustered by (key, value) into 2 BUCKETS stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table1(key string, value string) clustered by (key, value) into 2 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: create table table2(key string, value string) clustered by (value, key) into 2 BUCKETS stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table2(key string, value string) clustered by (value, key) into 2 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table2 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table2 PREHOOK: query: load data local inpath '../../data/files/T2.txt' overwrite into table table2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table2 POSTHOOK: query: load data local inpath '../../data/files/T2.txt' overwrite into table table2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table2 FAILED: SemanticException [Error 10141]: Bucketed table metadata is not correct. Fix the metadata or don't use bucketed mapjoin, by setting hive.enforce.bucketmapjoin to false. The number of buckets for table table1 is 2, whereas the number of files is 1 diff --git a/ql/src/test/results/clientnegative/bucket_mapjoin_wrong_table_metadata_2.q.out b/ql/src/test/results/clientnegative/bucket_mapjoin_wrong_table_metadata_2.q.out index 099b8fa..2b87c65 100644 --- a/ql/src/test/results/clientnegative/bucket_mapjoin_wrong_table_metadata_2.q.out +++ b/ql/src/test/results/clientnegative/bucket_mapjoin_wrong_table_metadata_2.q.out @@ -13,47 +13,61 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table table1(key string, value string) partitioned by (ds string) clustered by (key, value) into 2 BUCKETS stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table1(key string, value string) partitioned by (ds string) clustered by (key, value) into 2 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: create table table2(key string, value string) clustered by (value, key) into 2 BUCKETS stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table2(key string, value string) clustered by (value, key) into 2 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table1 partition (ds='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table1 partition (ds='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table1 POSTHOOK: Output: default@table1@ds=1 PREHOOK: query: load data local inpath '../../data/files/T2.txt' overwrite into table table1 partition (ds='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table1@ds=1 POSTHOOK: query: load data local inpath '../../data/files/T2.txt' overwrite into table table1 partition (ds='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table1@ds=1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table1 partition (ds='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table1 partition (ds='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table1 POSTHOOK: Output: default@table1@ds=2 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table2 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table table2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table2 PREHOOK: query: load data local inpath '../../data/files/T2.txt' overwrite into table table2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table2 POSTHOOK: query: load data local inpath '../../data/files/T2.txt' overwrite into table table2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table2 FAILED: SemanticException [Error 10141]: Bucketed table metadata is not correct. Fix the metadata or don't use bucketed mapjoin, by setting hive.enforce.bucketmapjoin to false. The number of buckets for table table1 partition ds=1 is 2, whereas the number of files is 1 diff --git a/ql/src/test/results/clientnegative/clusterbydistributeby.q.out b/ql/src/test/results/clientnegative/clusterbydistributeby.q.out index e029f5d..c8ec1db 100644 --- a/ql/src/test/results/clientnegative/clusterbydistributeby.q.out +++ b/ql/src/test/results/clientnegative/clusterbydistributeby.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 FAILED: SemanticException 8:14 Cannot have both CLUSTER BY and DISTRIBUTE BY clauses. Error encountered near token 'tkey' diff --git a/ql/src/test/results/clientnegative/clusterbysortby.q.out b/ql/src/test/results/clientnegative/clusterbysortby.q.out index 3d30460..f331e99 100644 --- a/ql/src/test/results/clientnegative/clusterbysortby.q.out +++ b/ql/src/test/results/clientnegative/clusterbysortby.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 FAILED: SemanticException 8:8 Cannot have both CLUSTER BY and SORT BY clauses. Error encountered near token 'one' diff --git a/ql/src/test/results/clientnegative/column_change_skewedcol_type1.q.out b/ql/src/test/results/clientnegative/column_change_skewedcol_type1.q.out index 1ebf125..7b1803e 100644 --- a/ql/src/test/results/clientnegative/column_change_skewedcol_type1.q.out +++ b/ql/src/test/results/clientnegative/column_change_skewedcol_type1.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE skewedtable (key STRING, value STRING) SKEWED BY (key) ON (1,5,6) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE skewedtable (key STRING, value STRING) SKEWED BY (key) ON (1,5,6) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@skewedtable FAILED: SemanticException key is a skewed column. It's not allowed to rename skewed column or change skewed column type. diff --git a/ql/src/test/results/clientnegative/column_rename1.q.out b/ql/src/test/results/clientnegative/column_rename1.q.out index f4c101c..ff227dd 100644 --- a/ql/src/test/results/clientnegative/column_rename1.q.out +++ b/ql/src/test/results/clientnegative/column_rename1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrc POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src diff --git a/ql/src/test/results/clientnegative/column_rename2.q.out b/ql/src/test/results/clientnegative/column_rename2.q.out index ff08bb4..5cf40ab 100644 --- a/ql/src/test/results/clientnegative/column_rename2.q.out +++ b/ql/src/test/results/clientnegative/column_rename2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrc POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src diff --git a/ql/src/test/results/clientnegative/column_rename4.q.out b/ql/src/test/results/clientnegative/column_rename4.q.out index e4722f5..09287c2 100644 --- a/ql/src/test/results/clientnegative/column_rename4.q.out +++ b/ql/src/test/results/clientnegative/column_rename4.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrc POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src diff --git a/ql/src/test/results/clientnegative/column_rename5.q.out b/ql/src/test/results/clientnegative/column_rename5.q.out index 1ebf125..7b1803e 100644 --- a/ql/src/test/results/clientnegative/column_rename5.q.out +++ b/ql/src/test/results/clientnegative/column_rename5.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE skewedtable (key STRING, value STRING) SKEWED BY (key) ON (1,5,6) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE skewedtable (key STRING, value STRING) SKEWED BY (key) ON (1,5,6) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@skewedtable FAILED: SemanticException key is a skewed column. It's not allowed to rename skewed column or change skewed column type. diff --git a/ql/src/test/results/clientnegative/columnstats_partlvl_dp.q.out b/ql/src/test/results/clientnegative/columnstats_partlvl_dp.q.out index a306dd6..e51523e 100644 --- a/ql/src/test/results/clientnegative/columnstats_partlvl_dp.q.out +++ b/ql/src/test/results/clientnegative/columnstats_partlvl_dp.q.out @@ -5,50 +5,64 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@Employee_Part PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=2000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=2000.0/country=UK PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=4000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3500.0/country=UK PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3000.0/country=UK FAILED: SemanticException [Error 30008]: Dynamic partitioning is not supported yet while gathering column statistics through ANALYZE statement diff --git a/ql/src/test/results/clientnegative/columnstats_partlvl_incorrect_num_keys.q.out b/ql/src/test/results/clientnegative/columnstats_partlvl_incorrect_num_keys.q.out index 46c74bd..93fb60a 100644 --- a/ql/src/test/results/clientnegative/columnstats_partlvl_incorrect_num_keys.q.out +++ b/ql/src/test/results/clientnegative/columnstats_partlvl_incorrect_num_keys.q.out @@ -5,50 +5,64 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@Employee_Part PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=2000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=2000.0/country=UK PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=4000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3500.0/country=UK PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3000.0/country=UK FAILED: SemanticException [Error 30006]: Incorrect number of partitioning key specified in ANALYZE statement diff --git a/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values.q.out b/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values.q.out index 2bb6c2f..d48d8cb 100644 --- a/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values.q.out +++ b/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values.q.out @@ -5,50 +5,64 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@Employee_Part PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=2000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=2000.0/country=UK PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=4000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3500.0/country=UK PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3000.0/country=UK FAILED: SemanticException [Error 30007]: Invalid partitioning key/value specified in ANALYZE statement diff --git a/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out b/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out index 56a085f..118626e 100644 --- a/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out +++ b/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out @@ -5,50 +5,64 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@Employee_Part PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=2000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=2000.0/country=UK PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=4000.0/country=USA PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3500.0/country=UK PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=3000.0/country=UK FAILED: ParseException line 5:79 mismatched input 'partition' expecting KW_COMPUTE near ')' in analyze statement diff --git a/ql/src/test/results/clientnegative/columnstats_tbllvl.q.out b/ql/src/test/results/clientnegative/columnstats_tbllvl.q.out index 071d747..5471cba 100644 --- a/ql/src/test/results/clientnegative/columnstats_tbllvl.q.out +++ b/ql/src/test/results/clientnegative/columnstats_tbllvl.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE UserVisits_web_text_none ( avgTimeOnSite int) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE UserVisits_web_text_none ( sourceIP string, destURL string, @@ -26,11 +27,14 @@ POSTHOOK: query: CREATE TABLE UserVisits_web_text_none ( avgTimeOnSite int) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@UserVisits_web_text_none PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/UserVisits.dat" INTO TABLE UserVisits_web_text_none PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@uservisits_web_text_none POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/UserVisits.dat" INTO TABLE UserVisits_web_text_none POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@uservisits_web_text_none FAILED: SemanticException [Error 10002]: Invalid column reference 'destIP' (possible columns are [sourceip, desturl, visitdate, adrevenue, useragent, ccode, lcode, skeyword, avgtimeonsite]) diff --git a/ql/src/test/results/clientnegative/columnstats_tbllvl_complex_type.q.out b/ql/src/test/results/clientnegative/columnstats_tbllvl_complex_type.q.out index 5662f2a..addaa89 100644 --- a/ql/src/test/results/clientnegative/columnstats_tbllvl_complex_type.q.out +++ b/ql/src/test/results/clientnegative/columnstats_tbllvl_complex_type.q.out @@ -9,6 +9,7 @@ PREHOOK: query: CREATE TABLE table_complex_type ( d MAP> ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table_complex_type ( a STRING, b ARRAY, @@ -16,11 +17,14 @@ POSTHOOK: query: CREATE TABLE table_complex_type ( d MAP> ) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_complex_type PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/create_nested_type.txt' OVERWRITE INTO TABLE table_complex_type PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table_complex_type POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/create_nested_type.txt' OVERWRITE INTO TABLE table_complex_type POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table_complex_type FAILED: UDFArgumentTypeException Only primitive type arguments are accepted but map> is passed. diff --git a/ql/src/test/results/clientnegative/columnstats_tbllvl_incorrect_column.q.out b/ql/src/test/results/clientnegative/columnstats_tbllvl_incorrect_column.q.out index 071d747..5471cba 100644 --- a/ql/src/test/results/clientnegative/columnstats_tbllvl_incorrect_column.q.out +++ b/ql/src/test/results/clientnegative/columnstats_tbllvl_incorrect_column.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE UserVisits_web_text_none ( avgTimeOnSite int) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE UserVisits_web_text_none ( sourceIP string, destURL string, @@ -26,11 +27,14 @@ POSTHOOK: query: CREATE TABLE UserVisits_web_text_none ( avgTimeOnSite int) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@UserVisits_web_text_none PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/UserVisits.dat" INTO TABLE UserVisits_web_text_none PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@uservisits_web_text_none POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/UserVisits.dat" INTO TABLE UserVisits_web_text_none POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@uservisits_web_text_none FAILED: SemanticException [Error 10002]: Invalid column reference 'destIP' (possible columns are [sourceip, desturl, visitdate, adrevenue, useragent, ccode, lcode, skeyword, avgtimeonsite]) diff --git a/ql/src/test/results/clientnegative/compute_stats_long.q.out b/ql/src/test/results/clientnegative/compute_stats_long.q.out index 7d7abf3..c1373be 100644 --- a/ql/src/test/results/clientnegative/compute_stats_long.q.out +++ b/ql/src/test/results/clientnegative/compute_stats_long.q.out @@ -1,15 +1,19 @@ PREHOOK: query: create table tab_int(a int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab_int(a int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab_int PREHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/int.txt" INTO TABLE tab_int PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tab_int POSTHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/int.txt" INTO TABLE tab_int POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tab_int PREHOOK: query: -- compute stats should raise an error since the number of bit vectors > 1024 select compute_stats(a, 10000) from tab_int diff --git a/ql/src/test/results/clientnegative/create_or_replace_view1.q.out b/ql/src/test/results/clientnegative/create_or_replace_view1.q.out index 8c5d100..6db38a9 100644 --- a/ql/src/test/results/clientnegative/create_or_replace_view1.q.out +++ b/ql/src/test/results/clientnegative/create_or_replace_view1.q.out @@ -17,10 +17,12 @@ PREHOOK: query: alter view v add partition (ds='1',hr='2') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@srcpart PREHOOK: Input: default@v +PREHOOK: Output: default@v POSTHOOK: query: alter view v add partition (ds='1',hr='2') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@v +POSTHOOK: Output: default@v POSTHOOK: Output: default@v@ds=1/hr=2 FAILED: SemanticException [Error 10217]: Cannot replace a view with CREATE VIEW or REPLACE VIEW or ALTER VIEW AS SELECT if the view has partitions The following view has partition, it could not be replaced: v diff --git a/ql/src/test/results/clientnegative/create_or_replace_view2.q.out b/ql/src/test/results/clientnegative/create_or_replace_view2.q.out index 1c4430e..94ca0ef 100644 --- a/ql/src/test/results/clientnegative/create_or_replace_view2.q.out +++ b/ql/src/test/results/clientnegative/create_or_replace_view2.q.out @@ -17,10 +17,12 @@ PREHOOK: query: alter view v add partition (ds='1',hr='2') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@srcpart PREHOOK: Input: default@v +PREHOOK: Output: default@v POSTHOOK: query: alter view v add partition (ds='1',hr='2') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@v +POSTHOOK: Output: default@v POSTHOOK: Output: default@v@ds=1/hr=2 FAILED: SemanticException [Error 10217]: Cannot replace a view with CREATE VIEW or REPLACE VIEW or ALTER VIEW AS SELECT if the view has partitions The following view has partition, it could not be replaced: v diff --git a/ql/src/test/results/clientnegative/create_table_failure1.q.out b/ql/src/test/results/clientnegative/create_table_failure1.q.out index 7a9876e..9b9f563 100644 --- a/ql/src/test/results/clientnegative/create_table_failure1.q.out +++ b/ql/src/test/results/clientnegative/create_table_failure1.q.out @@ -1 +1 @@ -FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: Database does not exist: table_in_database_creation_not_exist +FAILED: SemanticException [Error 10072]: Database does not exist: table_in_database_creation_not_exist diff --git a/ql/src/test/results/clientnegative/create_table_failure2.q.out b/ql/src/test/results/clientnegative/create_table_failure2.q.out index 7a9876e..9b9f563 100644 --- a/ql/src/test/results/clientnegative/create_table_failure2.q.out +++ b/ql/src/test/results/clientnegative/create_table_failure2.q.out @@ -1 +1 @@ -FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: Database does not exist: table_in_database_creation_not_exist +FAILED: SemanticException [Error 10072]: Database does not exist: table_in_database_creation_not_exist diff --git a/ql/src/test/results/clientnegative/create_table_failure3.q.out b/ql/src/test/results/clientnegative/create_table_failure3.q.out index 461891a..9b9f563 100644 --- a/ql/src/test/results/clientnegative/create_table_failure3.q.out +++ b/ql/src/test/results/clientnegative/create_table_failure3.q.out @@ -1,3 +1 @@ -PREHOOK: query: create table table_in_database_creation_not_exist.test (a string) -PREHOOK: type: CREATETABLE -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidObjectException(message:There is no database named table_in_database_creation_not_exist) +FAILED: SemanticException [Error 10072]: Database does not exist: table_in_database_creation_not_exist diff --git a/ql/src/test/results/clientnegative/create_table_failure4.q.out b/ql/src/test/results/clientnegative/create_table_failure4.q.out index 888c876..9b9f563 100644 --- a/ql/src/test/results/clientnegative/create_table_failure4.q.out +++ b/ql/src/test/results/clientnegative/create_table_failure4.q.out @@ -1,3 +1 @@ -PREHOOK: query: create table `table_in_database_creation_not_exist.test` (a string) -PREHOOK: type: CREATETABLE -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidObjectException(message:There is no database named table_in_database_creation_not_exist) +FAILED: SemanticException [Error 10072]: Database does not exist: table_in_database_creation_not_exist diff --git a/ql/src/test/results/clientnegative/create_table_wrong_regex.q.out b/ql/src/test/results/clientnegative/create_table_wrong_regex.q.out index 97e8520..5f80270 100644 --- a/ql/src/test/results/clientnegative/create_table_wrong_regex.q.out +++ b/ql/src/test/results/clientnegative/create_table_wrong_regex.q.out @@ -6,6 +6,7 @@ PREHOOK: query: create table aa ( test STRING ) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.RegexSerDe' WITH SERDEPROPERTIES ("input.regex" = "[^\\](.*)", "output.format.string" = "$1s") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. java.util.regex.PatternSyntaxException: Unclosed character class near index 7 [^\](.*) ^ diff --git a/ql/src/test/results/clientnegative/create_view_failure1.q.out b/ql/src/test/results/clientnegative/create_view_failure1.q.out index 406a5df..e1c9a0c 100644 --- a/ql/src/test/results/clientnegative/create_view_failure1.q.out +++ b/ql/src/test/results/clientnegative/create_view_failure1.q.out @@ -5,9 +5,11 @@ POSTHOOK: type: DROPVIEW PREHOOK: query: -- views and tables share the same namespace CREATE TABLE xxx12(key int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- views and tables share the same namespace CREATE TABLE xxx12(key int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@xxx12 PREHOOK: query: CREATE VIEW xxx12 AS SELECT key FROM src PREHOOK: type: CREATEVIEW diff --git a/ql/src/test/results/clientnegative/create_view_failure2.q.out b/ql/src/test/results/clientnegative/create_view_failure2.q.out index f7964a9..6c8a26d 100644 --- a/ql/src/test/results/clientnegative/create_view_failure2.q.out +++ b/ql/src/test/results/clientnegative/create_view_failure2.q.out @@ -13,4 +13,5 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@xxx4 PREHOOK: query: CREATE TABLE xxx4(key int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. AlreadyExistsException(message:Table xxx4 already exists) diff --git a/ql/src/test/results/clientnegative/database_drop_not_empty.q.out b/ql/src/test/results/clientnegative/database_drop_not_empty.q.out index 6ccf95a..49a29f3 100644 --- a/ql/src/test/results/clientnegative/database_drop_not_empty.q.out +++ b/ql/src/test/results/clientnegative/database_drop_not_empty.q.out @@ -15,8 +15,10 @@ POSTHOOK: query: USE test_db POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE t(a INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: CREATE TABLE t(a INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@t PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE diff --git a/ql/src/test/results/clientnegative/database_drop_not_empty_restrict.q.out b/ql/src/test/results/clientnegative/database_drop_not_empty_restrict.q.out index c8275af..b210df1 100644 --- a/ql/src/test/results/clientnegative/database_drop_not_empty_restrict.q.out +++ b/ql/src/test/results/clientnegative/database_drop_not_empty_restrict.q.out @@ -15,8 +15,10 @@ POSTHOOK: query: USE db_drop_non_empty_restrict POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE t(a INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db_drop_non_empty_restrict POSTHOOK: query: CREATE TABLE t(a INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db_drop_non_empty_restrict POSTHOOK: Output: db_drop_non_empty_restrict@t PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE diff --git a/ql/src/test/results/clientnegative/ddltime.q.out b/ql/src/test/results/clientnegative/ddltime.q.out index c86d5cf..e18eed9 100644 --- a/ql/src/test/results/clientnegative/ddltime.q.out +++ b/ql/src/test/results/clientnegative/ddltime.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table T2 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table T2 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: 3:23 HOLD_DDLTIME hint cannot be applied to dynamic partitions or non-existent partitions. Error encountered near token ''1'' diff --git a/ql/src/test/results/clientnegative/decimal_precision.q.out b/ql/src/test/results/clientnegative/decimal_precision.q.out index 9eddd38..212cebf 100644 --- a/ql/src/test/results/clientnegative/decimal_precision.q.out +++ b/ql/src/test/results/clientnegative/decimal_precision.q.out @@ -7,10 +7,12 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_PRECISION FAILED: SemanticException [Error 10029]: Line 3:13 Invalid numerical constant '123456789012345678901234567890.123456789bd' diff --git a/ql/src/test/results/clientnegative/decimal_precision_1.q.out b/ql/src/test/results/clientnegative/decimal_precision_1.q.out index 21ef65f..6edd570 100644 --- a/ql/src/test/results/clientnegative/decimal_precision_1.q.out +++ b/ql/src/test/results/clientnegative/decimal_precision_1.q.out @@ -7,10 +7,12 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_PRECISION FAILED: SemanticException [Error 10029]: Line 3:44 Invalid numerical constant '1234567890123456789.0123456789bd' diff --git a/ql/src/test/results/clientnegative/default_partition_name.q.out b/ql/src/test/results/clientnegative/default_partition_name.q.out index 6a81e2c..588b818 100644 --- a/ql/src/test/results/clientnegative/default_partition_name.q.out +++ b/ql/src/test/results/clientnegative/default_partition_name.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table default_partition_name (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table default_partition_name (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@default_partition_name FAILED: SemanticException [Error 10111]: Partition value contains a reserved substring (User value: __HIVE_DEFAULT_PARTITION__ Reserved substring: __HIVE_DEFAULT_PARTITION__) diff --git a/ql/src/test/results/clientnegative/deletejar.q.out b/ql/src/test/results/clientnegative/deletejar.q.out index b873e34..91560ee 100644 --- a/ql/src/test/results/clientnegative/deletejar.q.out +++ b/ql/src/test/results/clientnegative/deletejar.q.out @@ -1,3 +1,4 @@ PREHOOK: query: CREATE TABLE DELETEJAR(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Cannot validate serde: org.apache.hadoop.hive.serde2.TestSerDe diff --git a/ql/src/test/results/clientnegative/desc_failure3.q.out b/ql/src/test/results/clientnegative/desc_failure3.q.out index 1f709c9..4b505c2 100644 --- a/ql/src/test/results/clientnegative/desc_failure3.q.out +++ b/ql/src/test/results/clientnegative/desc_failure3.q.out @@ -4,7 +4,9 @@ POSTHOOK: query: CREATE DATABASE db1 POSTHOOK: type: CREATEDATABASE PREHOOK: query: CREATE TABLE db1.t1(key1 INT, value1 STRING) PARTITIONED BY (ds STRING, part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db1 POSTHOOK: query: CREATE TABLE db1.t1(key1 INT, value1 STRING) PARTITIONED BY (ds STRING, part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db1 POSTHOOK: Output: db1@t1 FAILED: SemanticException [Error 10004]: Invalid table alias or column reference db1.t1.key1 diff --git a/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on1.q.out b/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on1.q.out index 6b21dee..a8bc692 100644 --- a/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on1.q.out +++ b/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on1.q.out @@ -9,8 +9,10 @@ POSTHOOK: Input: default@src 238 val_238 PREHOOK: query: CREATE TABLE test_table123 (a INT, b MAP) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table123 (a INT, b MAP) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table123 PREHOOK: query: INSERT OVERWRITE TABLE test_table123 PARTITION(ds="foo1") SELECT 1, MAP("a1", "b1") FROM src LIMIT 1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on2.q.out b/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on2.q.out index 5724f68..4600683 100644 --- a/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on2.q.out +++ b/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on2.q.out @@ -9,8 +9,10 @@ POSTHOOK: Input: default@src 238 val_238 PREHOOK: query: CREATE TABLE test_table123 (a INT, b STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table123 (a INT, b STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table123 PREHOOK: query: INSERT OVERWRITE TABLE test_table123 PARTITION(ds="foo1") SELECT 1, "one" FROM src LIMIT 1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/drop_partition_failure.q.out b/ql/src/test/results/clientnegative/drop_partition_failure.q.out index ed1e7e8..b94c6c2 100644 --- a/ql/src/test/results/clientnegative/drop_partition_failure.q.out +++ b/ql/src/test/results/clientnegative/drop_partition_failure.q.out @@ -1,28 +1,30 @@ PREHOOK: query: create table mp (a string) partitioned by (b string, c string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table mp (a string) partitioned by (b string, c string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mp PREHOOK: query: alter table mp add partition (b='1', c='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mp +PREHOOK: Output: default@mp POSTHOOK: query: alter table mp add partition (b='1', c='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mp +POSTHOOK: Output: default@mp POSTHOOK: Output: default@mp@b=1/c=1 PREHOOK: query: alter table mp add partition (b='1', c='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mp +PREHOOK: Output: default@mp POSTHOOK: query: alter table mp add partition (b='1', c='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mp +POSTHOOK: Output: default@mp POSTHOOK: Output: default@mp@b=1/c=2 PREHOOK: query: alter table mp add partition (b='2', c='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mp +PREHOOK: Output: default@mp POSTHOOK: query: alter table mp add partition (b='2', c='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mp +POSTHOOK: Output: default@mp POSTHOOK: Output: default@mp@b=2/c=2 PREHOOK: query: show partitions mp PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientnegative/drop_partition_filter_failure.q.out b/ql/src/test/results/clientnegative/drop_partition_filter_failure.q.out index f36d025..0ab5e02 100644 --- a/ql/src/test/results/clientnegative/drop_partition_filter_failure.q.out +++ b/ql/src/test/results/clientnegative/drop_partition_filter_failure.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table ptestfilter1 (a string, b int) partitioned by (c string, d string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ptestfilter1 (a string, b int) partitioned by (c string, d string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ptestfilter1 PREHOOK: query: alter table ptestfilter1 add partition (c='US', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter1 +PREHOOK: Output: default@ptestfilter1 POSTHOOK: query: alter table ptestfilter1 add partition (c='US', d=1) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter1 +POSTHOOK: Output: default@ptestfilter1 POSTHOOK: Output: default@ptestfilter1@c=US/d=1 PREHOOK: query: show partitions ptestfilter1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientnegative/drop_table_failure3.q.out b/ql/src/test/results/clientnegative/drop_table_failure3.q.out index 8435822..9c1ff79 100644 --- a/ql/src/test/results/clientnegative/drop_table_failure3.q.out +++ b/ql/src/test/results/clientnegative/drop_table_failure3.q.out @@ -8,29 +8,31 @@ POSTHOOK: query: use dtf3 POSTHOOK: type: SWITCHDATABASE PREHOOK: query: create table drop_table_failure_temp(col STRING) partitioned by (p STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:dtf3 POSTHOOK: query: create table drop_table_failure_temp(col STRING) partitioned by (p STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:dtf3 POSTHOOK: Output: dtf3@drop_table_failure_temp PREHOOK: query: alter table drop_table_failure_temp add partition (p ='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: dtf3@drop_table_failure_temp +PREHOOK: Output: dtf3@drop_table_failure_temp POSTHOOK: query: alter table drop_table_failure_temp add partition (p ='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: dtf3@drop_table_failure_temp +POSTHOOK: Output: dtf3@drop_table_failure_temp POSTHOOK: Output: dtf3@drop_table_failure_temp@p=p1 PREHOOK: query: alter table drop_table_failure_temp add partition (p ='p2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: dtf3@drop_table_failure_temp +PREHOOK: Output: dtf3@drop_table_failure_temp POSTHOOK: query: alter table drop_table_failure_temp add partition (p ='p2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: dtf3@drop_table_failure_temp +POSTHOOK: Output: dtf3@drop_table_failure_temp POSTHOOK: Output: dtf3@drop_table_failure_temp@p=p2 PREHOOK: query: alter table drop_table_failure_temp add partition (p ='p3') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: dtf3@drop_table_failure_temp +PREHOOK: Output: dtf3@drop_table_failure_temp POSTHOOK: query: alter table drop_table_failure_temp add partition (p ='p3') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: dtf3@drop_table_failure_temp +POSTHOOK: Output: dtf3@drop_table_failure_temp POSTHOOK: Output: dtf3@drop_table_failure_temp@p=p3 PREHOOK: query: alter table drop_table_failure_temp partition (p ='p3') ENABLE NO_DROP PREHOOK: type: ALTERPARTITION_PROTECTMODE diff --git a/ql/src/test/results/clientnegative/drop_view_failure1.q.out b/ql/src/test/results/clientnegative/drop_view_failure1.q.out index e98133d..3a0038d 100644 --- a/ql/src/test/results/clientnegative/drop_view_failure1.q.out +++ b/ql/src/test/results/clientnegative/drop_view_failure1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE xxx1(key int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE xxx1(key int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@xxx1 PREHOOK: query: -- Can't use DROP VIEW on a base table DROP VIEW xxx1 diff --git a/ql/src/test/results/clientnegative/duplicate_insert1.q.out b/ql/src/test/results/clientnegative/duplicate_insert1.q.out index 2a9c02e..da654e3 100644 --- a/ql/src/test/results/clientnegative/duplicate_insert1.q.out +++ b/ql/src/test/results/clientnegative/duplicate_insert1.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table dest1_din1(key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest1_din1(key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1_din1 FAILED: SemanticException [Error 10087]: The same output cannot be present multiple times: dest1_din1 diff --git a/ql/src/test/results/clientnegative/duplicate_insert2.q.out b/ql/src/test/results/clientnegative/duplicate_insert2.q.out index 5255d85..9ff815f 100644 --- a/ql/src/test/results/clientnegative/duplicate_insert2.q.out +++ b/ql/src/test/results/clientnegative/duplicate_insert2.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table dest1_din2(key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest1_din2(key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1_din2 FAILED: SemanticException [Error 10087]: The same output cannot be present multiple times: dest1_din2@ds=1 diff --git a/ql/src/test/results/clientnegative/dyn_part1.q.out b/ql/src/test/results/clientnegative/dyn_part1.q.out index 13d813b..54d981f 100644 --- a/ql/src/test/results/clientnegative/dyn_part1.q.out +++ b/ql/src/test/results/clientnegative/dyn_part1.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table dynamic_partition (key string) partitioned by (value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dynamic_partition (key string) partitioned by (value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dynamic_partition FAILED: SemanticException Partition spec {hr=null} contains non-partition columns diff --git a/ql/src/test/results/clientnegative/dyn_part2.q.out b/ql/src/test/results/clientnegative/dyn_part2.q.out index 9800013..da6c8c6 100644 --- a/ql/src/test/results/clientnegative/dyn_part2.q.out +++ b/ql/src/test/results/clientnegative/dyn_part2.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table nzhang_part1 (key string, value string) partitioned by (ds string, hr string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nzhang_part1 (key string, value string) partitioned by (ds string, hr string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part1 FAILED: SemanticException [Error 10044]: Line 3:23 Cannot insert into target table because column number/types are different 'hr': Table insclause-0 has 3 columns, but query has 2 columns. diff --git a/ql/src/test/results/clientnegative/dyn_part3.q.out b/ql/src/test/results/clientnegative/dyn_part3.q.out index e9122f2..4de5005 100644 --- a/ql/src/test/results/clientnegative/dyn_part3.q.out +++ b/ql/src/test/results/clientnegative/dyn_part3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table nzhang_part( key string) partitioned by (value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nzhang_part( key string) partitioned by (value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part PREHOOK: query: insert overwrite table nzhang_part partition(value) select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/dyn_part4.q.out b/ql/src/test/results/clientnegative/dyn_part4.q.out index 862e1b5..3d81c88 100644 --- a/ql/src/test/results/clientnegative/dyn_part4.q.out +++ b/ql/src/test/results/clientnegative/dyn_part4.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table nzhang_part4 (key string) partitioned by (ds string, hr string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nzhang_part4 (key string) partitioned by (ds string, hr string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part4 FAILED: SemanticException [Error 10094]: Line 3:46 Dynamic partition cannot be the parent of a static partition 'hr' diff --git a/ql/src/test/results/clientnegative/dyn_part_max.q.out b/ql/src/test/results/clientnegative/dyn_part_max.q.out index eb91275..000521f 100644 --- a/ql/src/test/results/clientnegative/dyn_part_max.q.out +++ b/ql/src/test/results/clientnegative/dyn_part_max.q.out @@ -7,11 +7,13 @@ PREHOOK: query: -- Test of hive.exec.max.dynamic.partitions CREATE TABLE max_parts(key STRING) PARTITIONED BY (value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test of hive.exec.max.dynamic.partitions -- Set hive.exec.max.dynamic.partitions.pernode to a large value so it will be ignored CREATE TABLE max_parts(key STRING) PARTITIONED BY (value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@max_parts PREHOOK: query: INSERT OVERWRITE TABLE max_parts PARTITION(value) SELECT key, value diff --git a/ql/src/test/results/clientnegative/dyn_part_max_per_node.q.out b/ql/src/test/results/clientnegative/dyn_part_max_per_node.q.out index c53199c..a5cb400 100644 --- a/ql/src/test/results/clientnegative/dyn_part_max_per_node.q.out +++ b/ql/src/test/results/clientnegative/dyn_part_max_per_node.q.out @@ -6,10 +6,12 @@ PREHOOK: query: -- Test of hive.exec.max.dynamic.partitions.pernode CREATE TABLE max_parts(key STRING) PARTITIONED BY (value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test of hive.exec.max.dynamic.partitions.pernode CREATE TABLE max_parts(key STRING) PARTITIONED BY (value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@max_parts PREHOOK: query: INSERT OVERWRITE TABLE max_parts PARTITION(value) SELECT key, value diff --git a/ql/src/test/results/clientnegative/dynamic_partitions_with_whitelist.q.out b/ql/src/test/results/clientnegative/dynamic_partitions_with_whitelist.q.out index 3dd2121..25833ab 100644 --- a/ql/src/test/results/clientnegative/dynamic_partitions_with_whitelist.q.out +++ b/ql/src/test/results/clientnegative/dynamic_partitions_with_whitelist.q.out @@ -1,18 +1,24 @@ PREHOOK: query: create table source_table like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table source_table like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@source_table PREHOOK: query: create table dest_table like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest_table like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_table PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE source_table partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@source_table POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE source_table partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@source_table POSTHOOK: Output: default@source_table@ds=2008-04-08/hr=11 PREHOOK: query: -- Tests creating dynamic partitions with characters not in the whitelist (i.e. 9) diff --git a/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out b/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out index 8499427..e002609 100644 --- a/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out +++ b/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS @@ -18,17 +22,17 @@ POSTHOOK: query: SHOW PARTITIONS exchange_part_test2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='h1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='h1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=h1 PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='h2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='h2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=h2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out b/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out index b8c3c139..76f3233 100644 --- a/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out +++ b/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS @@ -18,17 +22,17 @@ POSTHOOK: query: SHOW PARTITIONS exchange_part_test2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05 PREHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test2 +PREHOOK: Output: default@exchange_part_test2 POSTHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test2 +POSTHOOK: Output: default@exchange_part_test2 POSTHOOK: Output: default@exchange_part_test2@ds=2013-04-05 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out b/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out index 93c3406..ed13e2e 100644 --- a/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out +++ b/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS @@ -18,24 +22,24 @@ POSTHOOK: query: SHOW PARTITIONS exchange_part_test2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=1 PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=2 PREHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='3') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test2 +PREHOOK: Output: default@exchange_part_test2 POSTHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='3') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test2 +POSTHOOK: Output: default@exchange_part_test2 POSTHOOK: Output: default@exchange_part_test2@ds=2013-04-05/hr=3 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out b/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out index d0959ef..7f7880b 100644 --- a/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out +++ b/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS @@ -18,24 +22,24 @@ POSTHOOK: query: SHOW PARTITIONS exchange_part_test2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=1 PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=2 PREHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test2 +PREHOOK: Output: default@exchange_part_test2 POSTHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test2 +POSTHOOK: Output: default@exchange_part_test2 POSTHOOK: Output: default@exchange_part_test2@ds=2013-04-05/hr=1 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientnegative/exchange_partition_neg_partition_missing.q.out b/ql/src/test/results/clientnegative/exchange_partition_neg_partition_missing.q.out index 3ecb78d..d296512 100644 --- a/ql/src/test/results/clientnegative/exchange_partition_neg_partition_missing.q.out +++ b/ql/src/test/results/clientnegative/exchange_partition_neg_partition_missing.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientnegative/exchange_partition_neg_table_missing2.q.out b/ql/src/test/results/clientnegative/exchange_partition_neg_table_missing2.q.out index c4312ef..504bec1 100644 --- a/ql/src/test/results/clientnegative/exchange_partition_neg_table_missing2.q.out +++ b/ql/src/test/results/clientnegative/exchange_partition_neg_table_missing2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS @@ -9,10 +11,10 @@ POSTHOOK: query: SHOW PARTITIONS exchange_part_test1 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientnegative/exchange_partition_neg_test.q.out b/ql/src/test/results/clientnegative/exchange_partition_neg_test.q.out index 3889a68..98e9314 100644 --- a/ql/src/test/results/clientnegative/exchange_partition_neg_test.q.out +++ b/ql/src/test/results/clientnegative/exchange_partition_neg_test.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: CREATE TABLE exchange_part_test2 (f1 string, f2 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string, f2 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS @@ -18,10 +22,10 @@ POSTHOOK: query: SHOW PARTITIONS exchange_part_test2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientnegative/exim_00_unsupported_schema.q.out b/ql/src/test/results/clientnegative/exim_00_unsupported_schema.q.out index 6d87826..03940dc 100644 --- a/ql/src/test/results/clientnegative/exim_00_unsupported_schema.q.out +++ b/ql/src/test/results/clientnegative/exim_00_unsupported_schema.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### FAILED: SemanticException Invalid path only the following file systems accepted for export/import : hdfs,pfile diff --git a/ql/src/test/results/clientnegative/exim_01_nonpart_over_loaded.q.out b/ql/src/test/results/clientnegative/exim_01_nonpart_over_loaded.q.out index 0c49c45..3f30f34 100644 --- a/ql/src/test/results/clientnegative/exim_01_nonpart_over_loaded.q.out +++ b/ql/src/test/results/clientnegative/exim_01_nonpart_over_loaded.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -42,15 +46,19 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("maker"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department identifier") stored as textfile tblproperties("maker"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: importer@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10119]: Table exists and contains data files diff --git a/ql/src/test/results/clientnegative/exim_02_all_part_over_overlap.q.out b/ql/src/test/results/clientnegative/exim_02_all_part_over_overlap.q.out index ef3380f..2bac0b2 100644 --- a/ql/src/test/results/clientnegative/exim_02_all_part_over_overlap.q.out +++ b/ql/src/test/results/clientnegative/exim_02_all_part_over_overlap.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### @@ -84,20 +94,24 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("maker"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "table of employees" partitioned by (emp_country string comment "iso code", emp_state string comment "free-form text") stored as textfile tblproperties("maker"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: importer@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: importer@exim_employee POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=ka FAILED: SemanticException [Error 10118]: Partition already exists emp_country=us,emp_state=ka diff --git a/ql/src/test/results/clientnegative/exim_03_nonpart_noncompat_colschema.q.out b/ql/src/test/results/clientnegative/exim_03_nonpart_noncompat_colschema.q.out index 10dee16..45c6206 100644 --- a/ql/src/test/results/clientnegative/exim_03_nonpart_noncompat_colschema.q.out +++ b/ql/src/test/results/clientnegative/exim_03_nonpart_noncompat_colschema.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -42,9 +46,11 @@ PREHOOK: query: create table exim_department ( dep_key int comment "department i stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_key int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Column Schema does not match diff --git a/ql/src/test/results/clientnegative/exim_04_nonpart_noncompat_colnumber.q.out b/ql/src/test/results/clientnegative/exim_04_nonpart_noncompat_colnumber.q.out index 518a9a1..23858ef 100644 --- a/ql/src/test/results/clientnegative/exim_04_nonpart_noncompat_colnumber.q.out +++ b/ql/src/test/results/clientnegative/exim_04_nonpart_noncompat_colnumber.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -42,9 +46,11 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id", dep_name string) stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Column Schema does not match diff --git a/ql/src/test/results/clientnegative/exim_05_nonpart_noncompat_coltype.q.out b/ql/src/test/results/clientnegative/exim_05_nonpart_noncompat_coltype.q.out index ad295c2..2a8e43a 100644 --- a/ql/src/test/results/clientnegative/exim_05_nonpart_noncompat_coltype.q.out +++ b/ql/src/test/results/clientnegative/exim_05_nonpart_noncompat_coltype.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -42,9 +46,11 @@ PREHOOK: query: create table exim_department ( dep_id bigint comment "department stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id bigint comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Column Schema does not match diff --git a/ql/src/test/results/clientnegative/exim_06_nonpart_noncompat_storage.q.out b/ql/src/test/results/clientnegative/exim_06_nonpart_noncompat_storage.q.out index dc3e782..b0012c8 100644 --- a/ql/src/test/results/clientnegative/exim_06_nonpart_noncompat_storage.q.out +++ b/ql/src/test/results/clientnegative/exim_06_nonpart_noncompat_storage.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -42,9 +46,11 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as rcfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as rcfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Table inputformat/outputformats do not match diff --git a/ql/src/test/results/clientnegative/exim_07_nonpart_noncompat_ifof.q.out b/ql/src/test/results/clientnegative/exim_07_nonpart_noncompat_ifof.q.out index 2d1283e..be6782e 100644 --- a/ql/src/test/results/clientnegative/exim_07_nonpart_noncompat_ifof.q.out +++ b/ql/src/test/results/clientnegative/exim_07_nonpart_noncompat_ifof.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -45,6 +49,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id outputdriver "org.apache.hadoop.hive.howl.rcfile.RCFileOutputDriver" tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as inputformat "org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat" outputformat "org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat" @@ -52,5 +57,6 @@ POSTHOOK: query: create table exim_department ( dep_id int comment "department i outputdriver "org.apache.hadoop.hive.howl.rcfile.RCFileOutputDriver" tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Table inputformat/outputformats do not match diff --git a/ql/src/test/results/clientnegative/exim_08_nonpart_noncompat_serde.q.out b/ql/src/test/results/clientnegative/exim_08_nonpart_noncompat_serde.q.out index 864cf24..2a7ecce 100644 --- a/ql/src/test/results/clientnegative/exim_08_nonpart_noncompat_serde.q.out +++ b/ql/src/test/results/clientnegative/exim_08_nonpart_noncompat_serde.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -43,10 +47,12 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") row format serde "org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe" stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Table Serde class does not match diff --git a/ql/src/test/results/clientnegative/exim_09_nonpart_noncompat_serdeparam.q.out b/ql/src/test/results/clientnegative/exim_09_nonpart_noncompat_serdeparam.q.out index 78a6eb8..e4c835b 100644 --- a/ql/src/test/results/clientnegative/exim_09_nonpart_noncompat_serdeparam.q.out +++ b/ql/src/test/results/clientnegative/exim_09_nonpart_noncompat_serdeparam.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -47,6 +51,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id outputdriver "org.apache.hadoop.hive.howl.rcfile.RCFileOutputDriver" tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") row format serde "org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe" with serdeproperties ("serialization.format"="0") @@ -56,5 +61,6 @@ POSTHOOK: query: create table exim_department ( dep_id int comment "department i outputdriver "org.apache.hadoop.hive.howl.rcfile.RCFileOutputDriver" tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Table Serde format does not match diff --git a/ql/src/test/results/clientnegative/exim_10_nonpart_noncompat_bucketing.q.out b/ql/src/test/results/clientnegative/exim_10_nonpart_noncompat_bucketing.q.out index 2d8e411..4107301 100644 --- a/ql/src/test/results/clientnegative/exim_10_nonpart_noncompat_bucketing.q.out +++ b/ql/src/test/results/clientnegative/exim_10_nonpart_noncompat_bucketing.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -43,10 +47,12 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") clustered by (dep_id) into 10 buckets stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Table bucketing spec does not match diff --git a/ql/src/test/results/clientnegative/exim_11_nonpart_noncompat_sorting.q.out b/ql/src/test/results/clientnegative/exim_11_nonpart_noncompat_sorting.q.out index ec65f5e..fa6c9c5 100644 --- a/ql/src/test/results/clientnegative/exim_11_nonpart_noncompat_sorting.q.out +++ b/ql/src/test/results/clientnegative/exim_11_nonpart_noncompat_sorting.q.out @@ -3,17 +3,21 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") clustered by (dep_id) sorted by (dep_id desc) into 10 buckets stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -45,10 +49,12 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") clustered by (dep_id) sorted by (dep_id asc) into 10 buckets stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Table sorting spec does not match diff --git a/ql/src/test/results/clientnegative/exim_12_nonnative_export.q.out b/ql/src/test/results/clientnegative/exim_12_nonnative_export.q.out index 89456b6..76e3ee6 100644 --- a/ql/src/test/results/clientnegative/exim_12_nonnative_export.q.out +++ b/ql/src/test/results/clientnegative/exim_12_nonnative_export.q.out @@ -3,10 +3,12 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored by "org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler" tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") clustered by (dep_id) sorted by (dep_id desc) into 10 buckets stored by "org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler" tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department FAILED: SemanticException [Error 10121]: Export/Import cannot be done for a non-native table. diff --git a/ql/src/test/results/clientnegative/exim_13_nonnative_import.q.out b/ql/src/test/results/clientnegative/exim_13_nonnative_import.q.out index f76e8f6..e719442 100644 --- a/ql/src/test/results/clientnegative/exim_13_nonnative_import.q.out +++ b/ql/src/test/results/clientnegative/exim_13_nonnative_import.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -42,9 +46,11 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored by "org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler" tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored by "org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler" tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10121]: Export/Import cannot be done for a non-native table. diff --git a/ql/src/test/results/clientnegative/exim_14_nonpart_part.q.out b/ql/src/test/results/clientnegative/exim_14_nonpart_part.q.out index 8bc96e1..b79ca01 100644 --- a/ql/src/test/results/clientnegative/exim_14_nonpart_part.q.out +++ b/ql/src/test/results/clientnegative/exim_14_nonpart_part.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -43,10 +47,12 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_org string) stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Partition Schema does not match diff --git a/ql/src/test/results/clientnegative/exim_15_part_nonpart.q.out b/ql/src/test/results/clientnegative/exim_15_part_nonpart.q.out index f70f1ef..b063fa7 100644 --- a/ql/src/test/results/clientnegative/exim_15_part_nonpart.q.out +++ b/ql/src/test/results/clientnegative/exim_15_part_nonpart.q.out @@ -3,17 +3,21 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_org string) stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department partition (dep_org="hr") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department partition (dep_org="hr") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department POSTHOOK: Output: default@exim_department@dep_org=hr #### A masked pattern was here #### @@ -45,9 +49,11 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Partition Schema does not match diff --git a/ql/src/test/results/clientnegative/exim_16_part_noncompat_schema.q.out b/ql/src/test/results/clientnegative/exim_16_part_noncompat_schema.q.out index 0049759..249ac3e 100644 --- a/ql/src/test/results/clientnegative/exim_16_part_noncompat_schema.q.out +++ b/ql/src/test/results/clientnegative/exim_16_part_noncompat_schema.q.out @@ -3,17 +3,21 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_org string) stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department partition (dep_org="hr") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department partition (dep_org="hr") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department POSTHOOK: Output: default@exim_department@dep_org=hr #### A masked pattern was here #### @@ -46,10 +50,12 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_mgr string) stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. Partition Schema does not match diff --git a/ql/src/test/results/clientnegative/exim_17_part_spec_underspec.q.out b/ql/src/test/results/clientnegative/exim_17_part_spec_underspec.q.out index b833fcf..893ad6d 100644 --- a/ql/src/test/results/clientnegative/exim_17_part_spec_underspec.q.out +++ b/ql/src/test/results/clientnegative/exim_17_part_spec_underspec.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/exim_18_part_spec_missing.q.out b/ql/src/test/results/clientnegative/exim_18_part_spec_missing.q.out index b833fcf..893ad6d 100644 --- a/ql/src/test/results/clientnegative/exim_18_part_spec_missing.q.out +++ b/ql/src/test/results/clientnegative/exim_18_part_spec_missing.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/exim_19_external_over_existing.q.out b/ql/src/test/results/clientnegative/exim_19_external_over_existing.q.out index 985704d..aa68e26 100644 --- a/ql/src/test/results/clientnegative/exim_19_external_over_existing.q.out +++ b/ql/src/test/results/clientnegative/exim_19_external_over_existing.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -42,9 +46,11 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department i stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. External table cannot overwrite existing table. Drop existing table first. diff --git a/ql/src/test/results/clientnegative/exim_20_managed_location_over_existing.q.out b/ql/src/test/results/clientnegative/exim_20_managed_location_over_existing.q.out index 9914351..fd4a418 100644 --- a/ql/src/test/results/clientnegative/exim_20_managed_location_over_existing.q.out +++ b/ql/src/test/results/clientnegative/exim_20_managed_location_over_existing.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -44,10 +48,14 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id location 'ql/test/data/tablestore/exim_department' tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile location 'ql/test/data/tablestore/exim_department' tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department #### A masked pattern was here #### diff --git a/ql/src/test/results/clientnegative/exim_21_part_managed_external.q.out b/ql/src/test/results/clientnegative/exim_21_part_managed_external.q.out index 11c158d..2ce5f1e 100644 --- a/ql/src/test/results/clientnegative/exim_21_part_managed_external.q.out +++ b/ql/src/test/results/clientnegative/exim_21_part_managed_external.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### @@ -84,11 +94,13 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_employee FAILED: SemanticException [Error 10120]: The existing table is not compatible with the import spec. External table cannot overwrite existing table. Drop existing table first. diff --git a/ql/src/test/results/clientnegative/exim_22_export_authfail.q.out b/ql/src/test/results/clientnegative/exim_22_export_authfail.q.out index 1339bbc..c7b9c49 100644 --- a/ql/src/test/results/clientnegative/exim_22_export_authfail.q.out +++ b/ql/src/test/results/clientnegative/exim_22_export_authfail.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department #### A masked pattern was here #### Authorization failed:No privilege 'Select' found for inputs { database:default, table:exim_department}. Use SHOW GRANT to get more details. diff --git a/ql/src/test/results/clientnegative/exim_23_import_exist_authfail.q.out b/ql/src/test/results/clientnegative/exim_23_import_exist_authfail.q.out index 22eaac7..c6fb9de 100644 --- a/ql/src/test/results/clientnegative/exim_23_import_exist_authfail.q.out +++ b/ql/src/test/results/clientnegative/exim_23_import_exist_authfail.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -36,7 +40,9 @@ POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department Authorization failed:No privilege 'Alter' found for outputs { database:importer, table:exim_department}. Use SHOW GRANT to get more details. diff --git a/ql/src/test/results/clientnegative/exim_24_import_part_authfail.q.out b/ql/src/test/results/clientnegative/exim_24_import_part_authfail.q.out index 6eee71e..945d3d2 100644 --- a/ql/src/test/results/clientnegative/exim_24_import_part_authfail.q.out +++ b/ql/src/test/results/clientnegative/exim_24_import_part_authfail.q.out @@ -4,20 +4,24 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn #### A masked pattern was here #### @@ -51,11 +55,13 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_employee Authorization failed:No privilege 'Alter' found for outputs { database:importer, table:exim_employee}. Use SHOW GRANT to get more details. diff --git a/ql/src/test/results/clientnegative/exim_25_import_nonexist_authfail.q.out b/ql/src/test/results/clientnegative/exim_25_import_nonexist_authfail.q.out index fb4224c..e606d72 100644 --- a/ql/src/test/results/clientnegative/exim_25_import_nonexist_authfail.q.out +++ b/ql/src/test/results/clientnegative/exim_25_import_nonexist_authfail.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' diff --git a/ql/src/test/results/clientnegative/external1.q.out b/ql/src/test/results/clientnegative/external1.q.out index 55cd21b..696beaa 100644 --- a/ql/src/test/results/clientnegative/external1.q.out +++ b/ql/src/test/results/clientnegative/external1.q.out @@ -1,3 +1,5 @@ #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. MetaException(message:Got exception: java.io.IOException No FileSystem for scheme: invalidscheme) diff --git a/ql/src/test/results/clientnegative/external2.q.out b/ql/src/test/results/clientnegative/external2.q.out index cf84962..a604885 100644 --- a/ql/src/test/results/clientnegative/external2.q.out +++ b/ql/src/test/results/clientnegative/external2.q.out @@ -1,9 +1,12 @@ PREHOOK: query: create external table external2(a int, b int) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create external table external2(a int, b int) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@external2 #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@external2 +#### A masked pattern was here #### +PREHOOK: Output: default@external2 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. MetaException(message:Got exception: java.io.IOException No FileSystem for scheme: invalidscheme) diff --git a/ql/src/test/results/clientnegative/fetchtask_ioexception.q.out b/ql/src/test/results/clientnegative/fetchtask_ioexception.q.out index 7447a28..2d84b1c 100644 --- a/ql/src/test/results/clientnegative/fetchtask_ioexception.q.out +++ b/ql/src/test/results/clientnegative/fetchtask_ioexception.q.out @@ -2,16 +2,20 @@ PREHOOK: query: CREATE TABLE fetchtask_ioexception ( KEY STRING, VALUE STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE fetchtask_ioexception ( KEY STRING, VALUE STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@fetchtask_ioexception PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1_broken.seq' OVERWRITE INTO TABLE fetchtask_ioexception PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@fetchtask_ioexception POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1_broken.seq' OVERWRITE INTO TABLE fetchtask_ioexception POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@fetchtask_ioexception PREHOOK: query: SELECT * FROM fetchtask_ioexception PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/fileformat_void_input.q.out b/ql/src/test/results/clientnegative/fileformat_void_input.q.out index 78187ed..6c51c1d 100644 --- a/ql/src/test/results/clientnegative/fileformat_void_input.q.out +++ b/ql/src/test/results/clientnegative/fileformat_void_input.q.out @@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS INPUTFORMAT 'java.lang.Void' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS INPUTFORMAT 'java.lang.Void' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 10 diff --git a/ql/src/test/results/clientnegative/groupby2_map_skew_multi_distinct.q.out b/ql/src/test/results/clientnegative/groupby2_map_skew_multi_distinct.q.out index ce40d2a..8de35cc 100644 --- a/ql/src/test/results/clientnegative/groupby2_map_skew_multi_distinct.q.out +++ b/ql/src/test/results/clientnegative/groupby2_map_skew_multi_distinct.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 FAILED: SemanticException [Error 10022]: DISTINCT on different columns not supported with skew in data diff --git a/ql/src/test/results/clientnegative/groupby2_multi_distinct.q.out b/ql/src/test/results/clientnegative/groupby2_multi_distinct.q.out index ca3d4fc..445e17d 100644 --- a/ql/src/test/results/clientnegative/groupby2_multi_distinct.q.out +++ b/ql/src/test/results/clientnegative/groupby2_multi_distinct.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g2 FAILED: SemanticException [Error 10022]: DISTINCT on different columns not supported with skew in data diff --git a/ql/src/test/results/clientnegative/groupby3_map_skew_multi_distinct.q.out b/ql/src/test/results/clientnegative/groupby3_map_skew_multi_distinct.q.out index 856213b..e066224 100644 --- a/ql/src/test/results/clientnegative/groupby3_map_skew_multi_distinct.q.out +++ b/ql/src/test/results/clientnegative/groupby3_map_skew_multi_distinct.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 FAILED: SemanticException [Error 10022]: DISTINCT on different columns not supported with skew in data diff --git a/ql/src/test/results/clientnegative/groupby3_multi_distinct.q.out b/ql/src/test/results/clientnegative/groupby3_multi_distinct.q.out index 856213b..e066224 100644 --- a/ql/src/test/results/clientnegative/groupby3_multi_distinct.q.out +++ b/ql/src/test/results/clientnegative/groupby3_multi_distinct.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 FAILED: SemanticException [Error 10022]: DISTINCT on different columns not supported with skew in data diff --git a/ql/src/test/results/clientnegative/groupby_grouping_id1.q.out b/ql/src/test/results/clientnegative/groupby_grouping_id1.q.out index ce2e827..5980f26 100644 --- a/ql/src/test/results/clientnegative/groupby_grouping_id1.q.out +++ b/ql/src/test/results/clientnegative/groupby_grouping_id1.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 FAILED: SemanticException [Error 10004]: Line 3:7 Invalid table alias or column reference 'GROUPING__ID': (possible column names are: key, val) diff --git a/ql/src/test/results/clientnegative/groupby_grouping_sets1.q.out b/ql/src/test/results/clientnegative/groupby_grouping_sets1.q.out index 9cb1762..e216778 100644 --- a/ql/src/test/results/clientnegative/groupby_grouping_sets1.q.out +++ b/ql/src/test/results/clientnegative/groupby_grouping_sets1.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 FAILED: SemanticException [Error 10211]: Grouping sets aggregations are not allowed if no aggregation function is presented diff --git a/ql/src/test/results/clientnegative/groupby_grouping_sets2.q.out b/ql/src/test/results/clientnegative/groupby_grouping_sets2.q.out index 9cb1762..e216778 100644 --- a/ql/src/test/results/clientnegative/groupby_grouping_sets2.q.out +++ b/ql/src/test/results/clientnegative/groupby_grouping_sets2.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 FAILED: SemanticException [Error 10211]: Grouping sets aggregations are not allowed if no aggregation function is presented diff --git a/ql/src/test/results/clientnegative/groupby_grouping_sets3.q.out b/ql/src/test/results/clientnegative/groupby_grouping_sets3.q.out index 1e7535c..158c50d 100644 --- a/ql/src/test/results/clientnegative/groupby_grouping_sets3.q.out +++ b/ql/src/test/results/clientnegative/groupby_grouping_sets3.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 FAILED: SemanticException 4:46 [Error 10213]: Grouping sets expression is not in GROUP BY key. Error encountered near token 'b' diff --git a/ql/src/test/results/clientnegative/groupby_grouping_sets4.q.out b/ql/src/test/results/clientnegative/groupby_grouping_sets4.q.out index 04accdf..a9c0665 100644 --- a/ql/src/test/results/clientnegative/groupby_grouping_sets4.q.out +++ b/ql/src/test/results/clientnegative/groupby_grouping_sets4.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 FAILED: SemanticException [Error 10025]: Line 4:7 Expression not in GROUP BY key 'a' diff --git a/ql/src/test/results/clientnegative/groupby_grouping_sets5.q.out b/ql/src/test/results/clientnegative/groupby_grouping_sets5.q.out index 04accdf..a9c0665 100644 --- a/ql/src/test/results/clientnegative/groupby_grouping_sets5.q.out +++ b/ql/src/test/results/clientnegative/groupby_grouping_sets5.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 FAILED: SemanticException [Error 10025]: Line 4:7 Expression not in GROUP BY key 'a' diff --git a/ql/src/test/results/clientnegative/groupby_grouping_sets6.q.out b/ql/src/test/results/clientnegative/groupby_grouping_sets6.q.out index 7b8ee1d..510e8b4 100644 --- a/ql/src/test/results/clientnegative/groupby_grouping_sets6.q.out +++ b/ql/src/test/results/clientnegative/groupby_grouping_sets6.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 FAILED: SemanticException [Error 10226]: An additional MR job is introduced since the cardinality of grouping sets is more than hive.new.job.grouping.set.cardinality. This functionality is not supported with distincts. Either set hive.new.job.grouping.set.cardinality to a high number (higher than the number of rows per input row due to grouping sets in the query), or rewrite the query to not use distincts. The number of rows per input row due to grouping sets is 4 diff --git a/ql/src/test/results/clientnegative/groupby_grouping_sets7.q.out b/ql/src/test/results/clientnegative/groupby_grouping_sets7.q.out index 1eaeb6d..4adfc97 100644 --- a/ql/src/test/results/clientnegative/groupby_grouping_sets7.q.out +++ b/ql/src/test/results/clientnegative/groupby_grouping_sets7.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 FAILED: SemanticException [Error 10225]: An additional MR job is introduced since the number of rows created per input row due to grouping sets is more than hive.new.job.grouping.set.cardinality. There is no need to handle skew separately. set hive.groupby.skewindata to false. The number of rows per input row due to grouping sets is 4 diff --git a/ql/src/test/results/clientnegative/illegal_partition_type.q.out b/ql/src/test/results/clientnegative/illegal_partition_type.q.out index e1f943d..0d02acc 100644 --- a/ql/src/test/results/clientnegative/illegal_partition_type.q.out +++ b/ql/src/test/results/clientnegative/illegal_partition_type.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- begin part(string, int) pass(string, string) CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- begin part(string, int) pass(string, string) CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab1 FAILED: SemanticException [Error 10248]: Cannot add partition column day of type string as it cannot be converted to type int diff --git a/ql/src/test/results/clientnegative/illegal_partition_type2.q.out b/ql/src/test/results/clientnegative/illegal_partition_type2.q.out index 1fb634c..aec0fa1 100644 --- a/ql/src/test/results/clientnegative/illegal_partition_type2.q.out +++ b/ql/src/test/results/clientnegative/illegal_partition_type2.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table tab1 (id1 int, id2 string) PARTITIONED BY(month string,day int) row format delimited fields terminated by ',' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab1 (id1 int, id2 string) PARTITIONED BY(month string,day int) row format delimited fields terminated by ',' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab1 FAILED: SemanticException [Error 10248]: Cannot add partition column day of type string as it cannot be converted to type int diff --git a/ql/src/test/results/clientnegative/illegal_partition_type3.q.out b/ql/src/test/results/clientnegative/illegal_partition_type3.q.out index 51cf203..7386258 100644 --- a/ql/src/test/results/clientnegative/illegal_partition_type3.q.out +++ b/ql/src/test/results/clientnegative/illegal_partition_type3.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table tab1(c int) partitioned by (i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab1(c int) partitioned by (i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab1 FAILED: SemanticException [Error 10248]: Cannot add partition column i of type string as it cannot be converted to type int diff --git a/ql/src/test/results/clientnegative/illegal_partition_type4.q.out b/ql/src/test/results/clientnegative/illegal_partition_type4.q.out index 8393318..fe90afb 100644 --- a/ql/src/test/results/clientnegative/illegal_partition_type4.q.out +++ b/ql/src/test/results/clientnegative/illegal_partition_type4.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table tab1(s string) PARTITIONED BY(dt date, st string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab1(s string) PARTITIONED BY(dt date, st string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab1 FAILED: SemanticException Unable to convert date literal string to date value. diff --git a/ql/src/test/results/clientnegative/insert_into1.q.out b/ql/src/test/results/clientnegative/insert_into1.q.out index 8ba9187..a38b679 100644 --- a/ql/src/test/results/clientnegative/insert_into1.q.out +++ b/ql/src/test/results/clientnegative/insert_into1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: DROP TABLE insert_into1_neg POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into1_neg (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into1_neg (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into1_neg PREHOOK: query: LOCK TABLE insert_into1_neg SHARED PREHOOK: type: LOCKTABLE diff --git a/ql/src/test/results/clientnegative/insert_into2.q.out b/ql/src/test/results/clientnegative/insert_into2.q.out index b41b310..f21823a 100644 --- a/ql/src/test/results/clientnegative/insert_into2.q.out +++ b/ql/src/test/results/clientnegative/insert_into2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: DROP TABLE insert_into1_neg POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into1_neg (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into1_neg (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into1_neg PREHOOK: query: LOCK TABLE insert_into1_neg EXCLUSIVE PREHOOK: type: LOCKTABLE diff --git a/ql/src/test/results/clientnegative/insert_into3.q.out b/ql/src/test/results/clientnegative/insert_into3.q.out index d6a3924..ef78c2a 100644 --- a/ql/src/test/results/clientnegative/insert_into3.q.out +++ b/ql/src/test/results/clientnegative/insert_into3.q.out @@ -5,9 +5,11 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into3_neg (key int, value string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into3_neg (key int, value string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into3_neg PREHOOK: query: INSERT INTO TABLE insert_into3_neg PARTITION (ds='1') SELECT * FROM src LIMIT 100 diff --git a/ql/src/test/results/clientnegative/insert_into4.q.out b/ql/src/test/results/clientnegative/insert_into4.q.out index 2b80e0a..d26e79f 100644 --- a/ql/src/test/results/clientnegative/insert_into4.q.out +++ b/ql/src/test/results/clientnegative/insert_into4.q.out @@ -5,9 +5,11 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into3_neg (key int, value string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into3_neg (key int, value string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into3_neg PREHOOK: query: INSERT INTO TABLE insert_into3_neg PARTITION (ds='1') SELECT * FROM src LIMIT 100 diff --git a/ql/src/test/results/clientnegative/insertexternal1.q.out b/ql/src/test/results/clientnegative/insertexternal1.q.out index c23d014..3df5013 100644 --- a/ql/src/test/results/clientnegative/insertexternal1.q.out +++ b/ql/src/test/results/clientnegative/insertexternal1.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create external table texternal(key string, val string) partitioned by (insertdate string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create external table texternal(key string, val string) partitioned by (insertdate string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@texternal #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@texternal +#### A masked pattern was here #### +PREHOOK: Output: default@texternal #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@texternal +#### A masked pattern was here #### +POSTHOOK: Output: default@texternal POSTHOOK: Output: default@texternal@insertdate=2008-01-01 FAILED: SemanticException [Error 10071]: Inserting into a external table is not allowed texternal diff --git a/ql/src/test/results/clientnegative/insertover_dynapart_ifnotexists.q.out b/ql/src/test/results/clientnegative/insertover_dynapart_ifnotexists.q.out index 3516e93..e46c7a6 100644 --- a/ql/src/test/results/clientnegative/insertover_dynapart_ifnotexists.q.out +++ b/ql/src/test/results/clientnegative/insertover_dynapart_ifnotexists.q.out @@ -1,18 +1,24 @@ PREHOOK: query: create table srcpart_dp like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart_dp like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_dp PREHOOK: query: create table destpart_dp like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table destpart_dp like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@destpart_dp PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_dp POSTHOOK: Output: default@srcpart_dp@ds=2008-04-08/hr=11 FAILED: SemanticException [Error 10127]: Dynamic partitions do not support IF NOT EXISTS. Specified partitions with value : {ds=2008-04-08} diff --git a/ql/src/test/results/clientnegative/invalid_cast_from_binary_1.q.out b/ql/src/test/results/clientnegative/invalid_cast_from_binary_1.q.out index c16de25..0897a2c 100644 --- a/ql/src/test/results/clientnegative/invalid_cast_from_binary_1.q.out +++ b/ql/src/test/results/clientnegative/invalid_cast_from_binary_1.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl FAILED: SemanticException Line 0:-1 Wrong arguments 'a': No matching method for class org.apache.hadoop.hive.ql.udf.UDFToInteger with (binary). Possible choices: _FUNC_(bigint) _FUNC_(boolean) _FUNC_(decimal(38,18)) _FUNC_(double) _FUNC_(float) _FUNC_(smallint) _FUNC_(string) _FUNC_(timestamp) _FUNC_(tinyint) _FUNC_(void) diff --git a/ql/src/test/results/clientnegative/invalid_cast_from_binary_2.q.out b/ql/src/test/results/clientnegative/invalid_cast_from_binary_2.q.out index 1ebd218..0384fd9 100644 --- a/ql/src/test/results/clientnegative/invalid_cast_from_binary_2.q.out +++ b/ql/src/test/results/clientnegative/invalid_cast_from_binary_2.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl FAILED: SemanticException Line 0:-1 Wrong arguments 'a': No matching method for class org.apache.hadoop.hive.ql.udf.UDFToByte with (binary). Possible choices: _FUNC_(bigint) _FUNC_(boolean) _FUNC_(decimal(38,18)) _FUNC_(double) _FUNC_(float) _FUNC_(int) _FUNC_(smallint) _FUNC_(string) _FUNC_(timestamp) _FUNC_(void) diff --git a/ql/src/test/results/clientnegative/invalid_cast_from_binary_3.q.out b/ql/src/test/results/clientnegative/invalid_cast_from_binary_3.q.out index a6d0062..bd5abe7 100644 --- a/ql/src/test/results/clientnegative/invalid_cast_from_binary_3.q.out +++ b/ql/src/test/results/clientnegative/invalid_cast_from_binary_3.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl FAILED: SemanticException Line 0:-1 Wrong arguments 'a': No matching method for class org.apache.hadoop.hive.ql.udf.UDFToShort with (binary). Possible choices: _FUNC_(bigint) _FUNC_(boolean) _FUNC_(decimal(38,18)) _FUNC_(double) _FUNC_(float) _FUNC_(int) _FUNC_(string) _FUNC_(timestamp) _FUNC_(tinyint) _FUNC_(void) diff --git a/ql/src/test/results/clientnegative/invalid_cast_from_binary_4.q.out b/ql/src/test/results/clientnegative/invalid_cast_from_binary_4.q.out index 1df4e1d..5e2df11 100644 --- a/ql/src/test/results/clientnegative/invalid_cast_from_binary_4.q.out +++ b/ql/src/test/results/clientnegative/invalid_cast_from_binary_4.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl FAILED: SemanticException Line 0:-1 Wrong arguments 'a': No matching method for class org.apache.hadoop.hive.ql.udf.UDFToLong with (binary). Possible choices: _FUNC_(bigint) _FUNC_(boolean) _FUNC_(decimal(38,18)) _FUNC_(double) _FUNC_(float) _FUNC_(int) _FUNC_(smallint) _FUNC_(string) _FUNC_(timestamp) _FUNC_(tinyint) _FUNC_(void) diff --git a/ql/src/test/results/clientnegative/invalid_cast_from_binary_5.q.out b/ql/src/test/results/clientnegative/invalid_cast_from_binary_5.q.out index 82bfc92..58ad9eb 100644 --- a/ql/src/test/results/clientnegative/invalid_cast_from_binary_5.q.out +++ b/ql/src/test/results/clientnegative/invalid_cast_from_binary_5.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl FAILED: SemanticException Line 0:-1 Wrong arguments 'a': No matching method for class org.apache.hadoop.hive.ql.udf.UDFToFloat with (binary). Possible choices: _FUNC_(bigint) _FUNC_(boolean) _FUNC_(decimal(38,18)) _FUNC_(double) _FUNC_(int) _FUNC_(smallint) _FUNC_(string) _FUNC_(timestamp) _FUNC_(tinyint) _FUNC_(void) diff --git a/ql/src/test/results/clientnegative/invalid_cast_from_binary_6.q.out b/ql/src/test/results/clientnegative/invalid_cast_from_binary_6.q.out index f3e1261..693034b 100644 --- a/ql/src/test/results/clientnegative/invalid_cast_from_binary_6.q.out +++ b/ql/src/test/results/clientnegative/invalid_cast_from_binary_6.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl FAILED: SemanticException Line 0:-1 Wrong arguments 'a': No matching method for class org.apache.hadoop.hive.ql.udf.UDFToDouble with (binary). Possible choices: _FUNC_(bigint) _FUNC_(boolean) _FUNC_(decimal(38,18)) _FUNC_(float) _FUNC_(int) _FUNC_(smallint) _FUNC_(string) _FUNC_(timestamp) _FUNC_(tinyint) _FUNC_(void) diff --git a/ql/src/test/results/clientnegative/invalid_select_column.q.out b/ql/src/test/results/clientnegative/invalid_select_column.q.out index bf5b456..1ace0e9 100644 --- a/ql/src/test/results/clientnegative/invalid_select_column.q.out +++ b/ql/src/test/results/clientnegative/invalid_select_column.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- Create table create table if not exists test_invalid_column(key string, value string ) partitioned by (year string, month string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create table create table if not exists test_invalid_column(key string, value string ) partitioned by (year string, month string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_invalid_column FAILED: SemanticException [Error 10004]: Line 3:41 Invalid table alias or column reference 'column1': (possible column names are: key, value, year, month) diff --git a/ql/src/test/results/clientnegative/invalid_select_column_with_subquery.q.out b/ql/src/test/results/clientnegative/invalid_select_column_with_subquery.q.out index 984b89b..354ed93 100644 --- a/ql/src/test/results/clientnegative/invalid_select_column_with_subquery.q.out +++ b/ql/src/test/results/clientnegative/invalid_select_column_with_subquery.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- Create table create table if not exists test_invalid_column(key string, value string ) partitioned by (year string, month string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create table create table if not exists test_invalid_column(key string, value string ) partitioned by (year string, month string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_invalid_column FAILED: SemanticException [Error 10002]: Line 3:61 Invalid column reference 'subq': (possible column names are: key, value, year, month) diff --git a/ql/src/test/results/clientnegative/invalid_select_column_with_tablename.q.out b/ql/src/test/results/clientnegative/invalid_select_column_with_tablename.q.out index 090e261..226ee37 100644 --- a/ql/src/test/results/clientnegative/invalid_select_column_with_tablename.q.out +++ b/ql/src/test/results/clientnegative/invalid_select_column_with_tablename.q.out @@ -1,8 +1,10 @@ PREHOOK: query: -- Create table create table if not exists test_invalid_column(key string, value string ) partitioned by (year string, month string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create table create table if not exists test_invalid_column(key string, value string ) partitioned by (year string, month string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_invalid_column FAILED: SemanticException [Error 10002]: Line 3:41 Invalid column reference 'test_invalid_column': (possible column names are: key, value, year, month) diff --git a/ql/src/test/results/clientnegative/invalid_t_alter1.q.out b/ql/src/test/results/clientnegative/invalid_t_alter1.q.out index d769404..232f663 100644 --- a/ql/src/test/results/clientnegative/invalid_t_alter1.q.out +++ b/ql/src/test/results/clientnegative/invalid_t_alter1.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE alter_test (d STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE alter_test (d STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_test FAILED: SemanticException [Error 10099]: DATETIME type isn't supported yet. Please use DATE or TIMESTAMP instead diff --git a/ql/src/test/results/clientnegative/invalid_t_alter2.q.out b/ql/src/test/results/clientnegative/invalid_t_alter2.q.out index d769404..232f663 100644 --- a/ql/src/test/results/clientnegative/invalid_t_alter2.q.out +++ b/ql/src/test/results/clientnegative/invalid_t_alter2.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE alter_test (d STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE alter_test (d STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_test FAILED: SemanticException [Error 10099]: DATETIME type isn't supported yet. Please use DATE or TIMESTAMP instead diff --git a/ql/src/test/results/clientnegative/invalidate_view1.q.out b/ql/src/test/results/clientnegative/invalidate_view1.q.out index fdc6053..c9da48d 100644 --- a/ql/src/test/results/clientnegative/invalidate_view1.q.out +++ b/ql/src/test/results/clientnegative/invalidate_view1.q.out @@ -11,11 +11,13 @@ PREHOOK: query: -- create two levels of view reference, then invalidate intermed -- querying outermost view results in full error context CREATE TABLE xxx10 (key int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- create two levels of view reference, then invalidate intermediate view -- by dropping a column from underlying table, and verify that -- querying outermost view results in full error context CREATE TABLE xxx10 (key int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@xxx10 PREHOOK: query: CREATE VIEW xxx9 AS SELECT * FROM xxx10 PREHOOK: type: CREATEVIEW diff --git a/ql/src/test/results/clientnegative/join28.q.out b/ql/src/test/results/clientnegative/join28.q.out index 9916d73..f3211cb 100644 --- a/ql/src/test/results/clientnegative/join28.q.out +++ b/ql/src/test/results/clientnegative/join28.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 FAILED: SemanticException [Error 10227]: Not all clauses are supported with mapjoin hint. Please remove mapjoin hint. diff --git a/ql/src/test/results/clientnegative/join29.q.out b/ql/src/test/results/clientnegative/join29.q.out index 779e80b..b8b2739 100644 --- a/ql/src/test/results/clientnegative/join29.q.out +++ b/ql/src/test/results/clientnegative/join29.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 FAILED: SemanticException [Error 10227]: Not all clauses are supported with mapjoin hint. Please remove mapjoin hint. diff --git a/ql/src/test/results/clientnegative/join32.q.out b/ql/src/test/results/clientnegative/join32.q.out index 69c02aa..da3494b 100644 --- a/ql/src/test/results/clientnegative/join32.q.out +++ b/ql/src/test/results/clientnegative/join32.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 FAILED: SemanticException [Error 10227]: Not all clauses are supported with mapjoin hint. Please remove mapjoin hint. diff --git a/ql/src/test/results/clientnegative/join35.q.out b/ql/src/test/results/clientnegative/join35.q.out index 3244a7d..333c838 100644 --- a/ql/src/test/results/clientnegative/join35.q.out +++ b/ql/src/test/results/clientnegative/join35.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 FAILED: SemanticException [Error 10227]: Not all clauses are supported with mapjoin hint. Please remove mapjoin hint. diff --git a/ql/src/test/results/clientnegative/load_exist_part_authfail.q.out b/ql/src/test/results/clientnegative/load_exist_part_authfail.q.out index fbbdd1c..787b1eb 100644 --- a/ql/src/test/results/clientnegative/load_exist_part_authfail.q.out +++ b/ql/src/test/results/clientnegative/load_exist_part_authfail.q.out @@ -1,13 +1,15 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_src PREHOOK: query: alter table hive_test_src add partition (pcol1 = 'test_part') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@hive_test_src +PREHOOK: Output: default@hive_test_src POSTHOOK: query: alter table hive_test_src add partition (pcol1 = 'test_part') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@hive_test_src +POSTHOOK: Output: default@hive_test_src POSTHOOK: Output: default@hive_test_src@pcol1=test_part Authorization failed:No privilege 'Update' found for outputs { database:default, table:hive_test_src}. Use SHOW GRANT to get more details. diff --git a/ql/src/test/results/clientnegative/load_non_native.q.out b/ql/src/test/results/clientnegative/load_non_native.q.out index cd0c810..c3d5663 100644 --- a/ql/src/test/results/clientnegative/load_non_native.q.out +++ b/ql/src/test/results/clientnegative/load_non_native.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE non_native2(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE non_native2(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@non_native2 FAILED: SemanticException [Error 10101]: A non-native table cannot be used as target for LOAD diff --git a/ql/src/test/results/clientnegative/load_nonpart_authfail.q.out b/ql/src/test/results/clientnegative/load_nonpart_authfail.q.out index 1c364a5..cf48b14 100644 --- a/ql/src/test/results/clientnegative/load_nonpart_authfail.q.out +++ b/ql/src/test/results/clientnegative/load_nonpart_authfail.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table hive_test_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_src Authorization failed:No privilege 'Update' found for outputs { database:default, table:hive_test_src}. Use SHOW GRANT to get more details. diff --git a/ql/src/test/results/clientnegative/load_part_authfail.q.out b/ql/src/test/results/clientnegative/load_part_authfail.q.out index afc0aa4..2e896a8 100644 --- a/ql/src/test/results/clientnegative/load_part_authfail.q.out +++ b/ql/src/test/results/clientnegative/load_part_authfail.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_src Authorization failed:No privilege 'Update' found for outputs { database:default, table:hive_test_src}. Use SHOW GRANT to get more details. diff --git a/ql/src/test/results/clientnegative/load_part_nospec.q.out b/ql/src/test/results/clientnegative/load_part_nospec.q.out index edb84ce..9331a1c 100644 --- a/ql/src/test/results/clientnegative/load_part_nospec.q.out +++ b/ql/src/test/results/clientnegative/load_part_nospec.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_src FAILED: SemanticException [Error 10062]: Need to specify partition columns because the destination table is partitioned diff --git a/ql/src/test/results/clientnegative/load_stored_as_dirs.q.out b/ql/src/test/results/clientnegative/load_stored_as_dirs.q.out index 89d765d..b89027f 100644 --- a/ql/src/test/results/clientnegative/load_stored_as_dirs.q.out +++ b/ql/src/test/results/clientnegative/load_stored_as_dirs.q.out @@ -2,9 +2,11 @@ PREHOOK: query: -- Load data can't work with table with stored as directories CREATE TABLE if not exists stored_as_dirs_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)) stored as DIRECTORIES PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Load data can't work with table with stored as directories CREATE TABLE if not exists stored_as_dirs_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)) stored as DIRECTORIES POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stored_as_dirs_multiple FAILED: SemanticException [Error 10195]: A stored-as-directories table cannot be used as target for LOAD diff --git a/ql/src/test/results/clientnegative/load_wrong_fileformat.q.out b/ql/src/test/results/clientnegative/load_wrong_fileformat.q.out index da65353..628841c 100644 --- a/ql/src/test/results/clientnegative/load_wrong_fileformat.q.out +++ b/ql/src/test/results/clientnegative/load_wrong_fileformat.q.out @@ -4,15 +4,18 @@ PREHOOK: query: -- test for loading into tables with the correct file format CREATE TABLE load_wrong_fileformat_T1(name STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test for loading into tables with the correct file format -- test for loading into partitions with the correct file format CREATE TABLE load_wrong_fileformat_T1(name STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@load_wrong_fileformat_T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE load_wrong_fileformat_T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_wrong_fileformat_t1 Failed with exception Wrong file format. Please check the file's format. FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.MoveTask diff --git a/ql/src/test/results/clientnegative/load_wrong_fileformat_rc_seq.q.out b/ql/src/test/results/clientnegative/load_wrong_fileformat_rc_seq.q.out index 1c6a759..e94200b 100644 --- a/ql/src/test/results/clientnegative/load_wrong_fileformat_rc_seq.q.out +++ b/ql/src/test/results/clientnegative/load_wrong_fileformat_rc_seq.q.out @@ -4,15 +4,18 @@ PREHOOK: query: -- test for loading into tables with the correct file format CREATE TABLE T1(name STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test for loading into tables with the correct file format -- test for loading into partitions with the correct file format CREATE TABLE T1(name STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 Failed with exception Wrong file format. Please check the file's format. FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.MoveTask diff --git a/ql/src/test/results/clientnegative/load_wrong_fileformat_txt_seq.q.out b/ql/src/test/results/clientnegative/load_wrong_fileformat_txt_seq.q.out index 1c455e1..eb42478 100644 --- a/ql/src/test/results/clientnegative/load_wrong_fileformat_txt_seq.q.out +++ b/ql/src/test/results/clientnegative/load_wrong_fileformat_txt_seq.q.out @@ -4,15 +4,18 @@ PREHOOK: query: -- test for loading into tables with the correct file format CREATE TABLE T1(name STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test for loading into tables with the correct file format -- test for loading into partitions with the correct file format CREATE TABLE T1(name STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 Failed with exception Wrong file format. Please check the file's format. FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.MoveTask diff --git a/ql/src/test/results/clientnegative/load_wrong_noof_part.q.out b/ql/src/test/results/clientnegative/load_wrong_noof_part.q.out index bfab09f..80e80e3 100644 --- a/ql/src/test/results/clientnegative/load_wrong_noof_part.q.out +++ b/ql/src/test/results/clientnegative/load_wrong_noof_part.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE loadpart1(a STRING, b STRING) PARTITIONED BY (ds STRING,ds1 STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE loadpart1(a STRING, b STRING) PARTITIONED BY (ds STRING,ds1 STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loadpart1 FAILED: SemanticException [Error 10006]: Line 2:82 Partition not found ''2009-05-05'' diff --git a/ql/src/test/results/clientnegative/lockneg1.q.out b/ql/src/test/results/clientnegative/lockneg1.q.out index e29c2a8..10afe67 100644 --- a/ql/src/test/results/clientnegative/lockneg1.q.out +++ b/ql/src/test/results/clientnegative/lockneg1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrc POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/lockneg2.q.out b/ql/src/test/results/clientnegative/lockneg2.q.out index 44c665c..33a1f0b 100644 --- a/ql/src/test/results/clientnegative/lockneg2.q.out +++ b/ql/src/test/results/clientnegative/lockneg2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrc POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/lockneg3.q.out b/ql/src/test/results/clientnegative/lockneg3.q.out index ac85216..1173aba 100644 --- a/ql/src/test/results/clientnegative/lockneg3.q.out +++ b/ql/src/test/results/clientnegative/lockneg3.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='11') select key, value from srcpart where ds='2008-04-08' and hr='11' diff --git a/ql/src/test/results/clientnegative/lockneg4.q.out b/ql/src/test/results/clientnegative/lockneg4.q.out index 8d1a893..123f4f4 100644 --- a/ql/src/test/results/clientnegative/lockneg4.q.out +++ b/ql/src/test/results/clientnegative/lockneg4.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='11') select key, value from srcpart where ds='2008-04-08' and hr='11' diff --git a/ql/src/test/results/clientnegative/lockneg_query_tbl_in_locked_db.q.out b/ql/src/test/results/clientnegative/lockneg_query_tbl_in_locked_db.q.out index b1b773a..157c2d0 100644 --- a/ql/src/test/results/clientnegative/lockneg_query_tbl_in_locked_db.q.out +++ b/ql/src/test/results/clientnegative/lockneg_query_tbl_in_locked_db.q.out @@ -8,8 +8,10 @@ POSTHOOK: query: use lockneg1 POSTHOOK: type: SWITCHDATABASE PREHOOK: query: create table tstsrcpart like default.srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:lockneg1 POSTHOOK: query: create table tstsrcpart like default.srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:lockneg1 POSTHOOK: Output: lockneg1@tstsrcpart PREHOOK: query: insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='11') select key, value from default.srcpart where ds='2008-04-08' and hr='11' diff --git a/ql/src/test/results/clientnegative/lockneg_try_lock_db_in_use.q.out b/ql/src/test/results/clientnegative/lockneg_try_lock_db_in_use.q.out index 03218e8..80a2b85 100644 --- a/ql/src/test/results/clientnegative/lockneg_try_lock_db_in_use.q.out +++ b/ql/src/test/results/clientnegative/lockneg_try_lock_db_in_use.q.out @@ -8,8 +8,10 @@ POSTHOOK: query: use lockneg2 POSTHOOK: type: SWITCHDATABASE PREHOOK: query: create table tstsrcpart like default.srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:lockneg2 POSTHOOK: query: create table tstsrcpart like default.srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:lockneg2 POSTHOOK: Output: lockneg2@tstsrcpart PREHOOK: query: insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='11') select key, value from default.srcpart where ds='2008-04-08' and hr='11' diff --git a/ql/src/test/results/clientnegative/merge_negative_1.q.out b/ql/src/test/results/clientnegative/merge_negative_1.q.out index 82c02df..95f6678 100644 --- a/ql/src/test/results/clientnegative/merge_negative_1.q.out +++ b/ql/src/test/results/clientnegative/merge_negative_1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table src2 like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src2 like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src2 PREHOOK: query: CREATE INDEX src_index_merge_test ON TABLE src2(key) as 'COMPACT' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX diff --git a/ql/src/test/results/clientnegative/merge_negative_2.q.out b/ql/src/test/results/clientnegative/merge_negative_2.q.out index a1cec5b..b3422e1 100644 --- a/ql/src/test/results/clientnegative/merge_negative_2.q.out +++ b/ql/src/test/results/clientnegative/merge_negative_2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table srcpart2 (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart2 (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart2 PREHOOK: query: insert overwrite table srcpart2 partition (ds='2011') select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/merge_negative_3.q.out b/ql/src/test/results/clientnegative/merge_negative_3.q.out index bc8a60e..6fd029e 100644 --- a/ql/src/test/results/clientnegative/merge_negative_3.q.out +++ b/ql/src/test/results/clientnegative/merge_negative_3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table srcpart2 (key int, value string) partitioned by (ds string) clustered by (key) sorted by (key) into 2 buckets stored as RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart2 (key int, value string) partitioned by (ds string) clustered by (key) sorted by (key) into 2 buckets stored as RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart2 PREHOOK: query: insert overwrite table srcpart2 partition (ds='2011') select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/nested_complex_neg.q.out b/ql/src/test/results/clientnegative/nested_complex_neg.q.out index 27ba60c..59b5548 100644 --- a/ql/src/test/results/clientnegative/nested_complex_neg.q.out +++ b/ql/src/test/results/clientnegative/nested_complex_neg.q.out @@ -5,4 +5,5 @@ max_nested_map array>>>>>>>>>>>>>>>>>>>>>>, simple_string string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. java.lang.RuntimeException: MetaException(message:org.apache.hadoop.hive.serde2.SerDeException Number of levels of nesting supported for LazySimpleSerde is 7 Unable to work with level 23. Use hive.serialization.extend.nesting.levels serde property for tables using LazySimpleSerde.) diff --git a/ql/src/test/results/clientnegative/nopart_insert.q.out b/ql/src/test/results/clientnegative/nopart_insert.q.out index 28a0762..f3d6a0a 100644 --- a/ql/src/test/results/clientnegative/nopart_insert.q.out +++ b/ql/src/test/results/clientnegative/nopart_insert.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE nopart_insert(a STRING, b STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE nopart_insert(a STRING, b STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nopart_insert FAILED: SemanticException 3:23 Need to specify partition columns because the destination table is partitioned. Error encountered near token 'nopart_insert' diff --git a/ql/src/test/results/clientnegative/nopart_load.q.out b/ql/src/test/results/clientnegative/nopart_load.q.out index 49eb120..34637e4 100644 --- a/ql/src/test/results/clientnegative/nopart_load.q.out +++ b/ql/src/test/results/clientnegative/nopart_load.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE nopart_load(a STRING, b STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE nopart_load(a STRING, b STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nopart_load FAILED: SemanticException [Error 10062]: Need to specify partition columns because the destination table is partitioned diff --git a/ql/src/test/results/clientnegative/orderbysortby.q.out b/ql/src/test/results/clientnegative/orderbysortby.q.out index 40a0b5b..14999cd 100644 --- a/ql/src/test/results/clientnegative/orderbysortby.q.out +++ b/ql/src/test/results/clientnegative/orderbysortby.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 FAILED: SemanticException 8:8 Cannot have both ORDER BY and SORT BY clauses. Error encountered near token 'one' diff --git a/ql/src/test/results/clientnegative/protectmode_part.q.out b/ql/src/test/results/clientnegative/protectmode_part.q.out index 3d3c736..41cc5f9 100644 --- a/ql/src/test/results/clientnegative/protectmode_part.q.out +++ b/ql/src/test/results/clientnegative/protectmode_part.q.out @@ -8,22 +8,24 @@ drop table tbl_protectmode3 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode3 (col string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode3 (col string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode3 PREHOOK: query: alter table tbl_protectmode3 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode3 +PREHOOK: Output: default@tbl_protectmode3 POSTHOOK: query: alter table tbl_protectmode3 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode3 +POSTHOOK: Output: default@tbl_protectmode3 POSTHOOK: Output: default@tbl_protectmode3@p=p1 PREHOOK: query: alter table tbl_protectmode3 add partition (p='p2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode3 +PREHOOK: Output: default@tbl_protectmode3 POSTHOOK: query: alter table tbl_protectmode3 add partition (p='p2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode3 +POSTHOOK: Output: default@tbl_protectmode3 POSTHOOK: Output: default@tbl_protectmode3@p=p2 PREHOOK: query: select * from tbl_protectmode3 where p='p1' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/protectmode_part1.q.out b/ql/src/test/results/clientnegative/protectmode_part1.q.out index ab631e4..a017a79 100644 --- a/ql/src/test/results/clientnegative/protectmode_part1.q.out +++ b/ql/src/test/results/clientnegative/protectmode_part1.q.out @@ -8,27 +8,31 @@ drop table tbl_protectmode5 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode5_1 (col string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode5_1 (col string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode5_1 PREHOOK: query: create table tbl_protectmode5 (col string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode5 (col string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode5 PREHOOK: query: alter table tbl_protectmode5 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode5 +PREHOOK: Output: default@tbl_protectmode5 POSTHOOK: query: alter table tbl_protectmode5 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode5 +POSTHOOK: Output: default@tbl_protectmode5 POSTHOOK: Output: default@tbl_protectmode5@p=p1 PREHOOK: query: alter table tbl_protectmode5 add partition (p='p2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode5 +PREHOOK: Output: default@tbl_protectmode5 POSTHOOK: query: alter table tbl_protectmode5 add partition (p='p2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode5 +POSTHOOK: Output: default@tbl_protectmode5 POSTHOOK: Output: default@tbl_protectmode5@p=p2 PREHOOK: query: insert overwrite table tbl_protectmode5_1 select col from tbl_protectmode5 where p='p1' diff --git a/ql/src/test/results/clientnegative/protectmode_part2.q.out b/ql/src/test/results/clientnegative/protectmode_part2.q.out index 3865b09..c2ab670 100644 --- a/ql/src/test/results/clientnegative/protectmode_part2.q.out +++ b/ql/src/test/results/clientnegative/protectmode_part2.q.out @@ -8,21 +8,25 @@ drop table tbl_protectmode6 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode6 (c1 string,c2 string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode6 (c1 string,c2 string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode6 PREHOOK: query: alter table tbl_protectmode6 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode6 +PREHOOK: Output: default@tbl_protectmode6 POSTHOOK: query: alter table tbl_protectmode6 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode6 +POSTHOOK: Output: default@tbl_protectmode6 POSTHOOK: Output: default@tbl_protectmode6@p=p1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE tbl_protectmode6 partition (p='p1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tbl_protectmode6@p=p1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE tbl_protectmode6 partition (p='p1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tbl_protectmode6@p=p1 PREHOOK: query: alter table tbl_protectmode6 partition (p='p1') enable offline PREHOOK: type: ALTERPARTITION_PROTECTMODE diff --git a/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out b/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out index 4a1c95f..2f0fabc 100644 --- a/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out +++ b/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out @@ -8,15 +8,17 @@ drop table tbl_protectmode_no_drop POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode_no_drop (c1 string,c2 string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_no_drop (c1 string,c2 string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_no_drop PREHOOK: query: alter table tbl_protectmode_no_drop add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode_no_drop +PREHOOK: Output: default@tbl_protectmode_no_drop POSTHOOK: query: alter table tbl_protectmode_no_drop add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode_no_drop +POSTHOOK: Output: default@tbl_protectmode_no_drop POSTHOOK: Output: default@tbl_protectmode_no_drop@p=p1 PREHOOK: query: alter table tbl_protectmode_no_drop partition (p='p1') enable no_drop PREHOOK: type: ALTERPARTITION_PROTECTMODE diff --git a/ql/src/test/results/clientnegative/protectmode_tbl1.q.out b/ql/src/test/results/clientnegative/protectmode_tbl1.q.out index c8c039a..0d6b0ff 100644 --- a/ql/src/test/results/clientnegative/protectmode_tbl1.q.out +++ b/ql/src/test/results/clientnegative/protectmode_tbl1.q.out @@ -8,8 +8,10 @@ drop table tbl_protectmode_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode_1 (col string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_1 (col string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_1 PREHOOK: query: select * from tbl_protectmode_1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/protectmode_tbl2.q.out b/ql/src/test/results/clientnegative/protectmode_tbl2.q.out index 7c3ed81..e44ae1a 100644 --- a/ql/src/test/results/clientnegative/protectmode_tbl2.q.out +++ b/ql/src/test/results/clientnegative/protectmode_tbl2.q.out @@ -8,15 +8,17 @@ drop table tbl_protectmode2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode2 (col string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode2 (col string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode2 PREHOOK: query: alter table tbl_protectmode2 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode2 +PREHOOK: Output: default@tbl_protectmode2 POSTHOOK: query: alter table tbl_protectmode2 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode2 +POSTHOOK: Output: default@tbl_protectmode2 POSTHOOK: Output: default@tbl_protectmode2@p=p1 PREHOOK: query: alter table tbl_protectmode2 enable no_drop PREHOOK: type: ALTERTABLE_PROTECTMODE diff --git a/ql/src/test/results/clientnegative/protectmode_tbl3.q.out b/ql/src/test/results/clientnegative/protectmode_tbl3.q.out index c56f67b..b05a371 100644 --- a/ql/src/test/results/clientnegative/protectmode_tbl3.q.out +++ b/ql/src/test/results/clientnegative/protectmode_tbl3.q.out @@ -8,8 +8,10 @@ drop table tbl_protectmode_4 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode_4 (col string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_4 (col string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_4 PREHOOK: query: select col from tbl_protectmode_4 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/protectmode_tbl4.q.out b/ql/src/test/results/clientnegative/protectmode_tbl4.q.out index 24f9746..77c2d0e 100644 --- a/ql/src/test/results/clientnegative/protectmode_tbl4.q.out +++ b/ql/src/test/results/clientnegative/protectmode_tbl4.q.out @@ -12,20 +12,24 @@ POSTHOOK: query: drop table tbl_protectmode_tbl4_src POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode_tbl4_src (col string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_tbl4_src (col string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_tbl4_src PREHOOK: query: create table tbl_protectmode_tbl4 (col string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_tbl4 (col string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_tbl4 PREHOOK: query: alter table tbl_protectmode_tbl4 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode_tbl4 +PREHOOK: Output: default@tbl_protectmode_tbl4 POSTHOOK: query: alter table tbl_protectmode_tbl4 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode_tbl4 +POSTHOOK: Output: default@tbl_protectmode_tbl4 POSTHOOK: Output: default@tbl_protectmode_tbl4@p=p1 PREHOOK: query: alter table tbl_protectmode_tbl4 enable no_drop PREHOOK: type: ALTERTABLE_PROTECTMODE diff --git a/ql/src/test/results/clientnegative/protectmode_tbl5.q.out b/ql/src/test/results/clientnegative/protectmode_tbl5.q.out index ce4b599..f078c91 100644 --- a/ql/src/test/results/clientnegative/protectmode_tbl5.q.out +++ b/ql/src/test/results/clientnegative/protectmode_tbl5.q.out @@ -12,20 +12,24 @@ POSTHOOK: query: drop table tbl_protectmode_tbl5_src POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode_tbl5_src (col string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_tbl5_src (col string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_tbl5_src PREHOOK: query: create table tbl_protectmode_tbl5 (col string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_tbl5 (col string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_tbl5 PREHOOK: query: alter table tbl_protectmode_tbl5 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode_tbl5 +PREHOOK: Output: default@tbl_protectmode_tbl5 POSTHOOK: query: alter table tbl_protectmode_tbl5 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode_tbl5 +POSTHOOK: Output: default@tbl_protectmode_tbl5 POSTHOOK: Output: default@tbl_protectmode_tbl5@p=p1 PREHOOK: query: alter table tbl_protectmode_tbl5 enable no_drop PREHOOK: type: ALTERTABLE_PROTECTMODE diff --git a/ql/src/test/results/clientnegative/protectmode_tbl6.q.out b/ql/src/test/results/clientnegative/protectmode_tbl6.q.out index 0bbfcbf..d38a05b 100644 --- a/ql/src/test/results/clientnegative/protectmode_tbl6.q.out +++ b/ql/src/test/results/clientnegative/protectmode_tbl6.q.out @@ -8,8 +8,10 @@ drop table tbl_protectmode_tbl6 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode_tbl6 (col string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_tbl6 (col string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_tbl6 PREHOOK: query: alter table tbl_protectmode_tbl6 enable no_drop cascade PREHOOK: type: ALTERTABLE_PROTECTMODE diff --git a/ql/src/test/results/clientnegative/protectmode_tbl7.q.out b/ql/src/test/results/clientnegative/protectmode_tbl7.q.out index 28e7b03..dd40c8d 100644 --- a/ql/src/test/results/clientnegative/protectmode_tbl7.q.out +++ b/ql/src/test/results/clientnegative/protectmode_tbl7.q.out @@ -8,15 +8,17 @@ drop table tbl_protectmode_tbl7 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode_tbl7 (col string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_tbl7 (col string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_tbl7 PREHOOK: query: alter table tbl_protectmode_tbl7 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode_tbl7 +PREHOOK: Output: default@tbl_protectmode_tbl7 POSTHOOK: query: alter table tbl_protectmode_tbl7 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode_tbl7 +POSTHOOK: Output: default@tbl_protectmode_tbl7 POSTHOOK: Output: default@tbl_protectmode_tbl7@p=p1 PREHOOK: query: alter table tbl_protectmode_tbl7 enable no_drop PREHOOK: type: ALTERTABLE_PROTECTMODE @@ -36,10 +38,10 @@ POSTHOOK: Input: default@tbl_protectmode_tbl7 POSTHOOK: Output: default@tbl_protectmode_tbl7@p=p1 PREHOOK: query: alter table tbl_protectmode_tbl7 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode_tbl7 +PREHOOK: Output: default@tbl_protectmode_tbl7 POSTHOOK: query: alter table tbl_protectmode_tbl7 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode_tbl7 +POSTHOOK: Output: default@tbl_protectmode_tbl7 POSTHOOK: Output: default@tbl_protectmode_tbl7@p=p1 PREHOOK: query: alter table tbl_protectmode_tbl7 enable no_drop cascade PREHOOK: type: ALTERTABLE_PROTECTMODE diff --git a/ql/src/test/results/clientnegative/protectmode_tbl8.q.out b/ql/src/test/results/clientnegative/protectmode_tbl8.q.out index bd716d8..3f312a6 100644 --- a/ql/src/test/results/clientnegative/protectmode_tbl8.q.out +++ b/ql/src/test/results/clientnegative/protectmode_tbl8.q.out @@ -8,15 +8,17 @@ drop table tbl_protectmode_tbl8 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode_tbl8 (col string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_tbl8 (col string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_tbl8 PREHOOK: query: alter table tbl_protectmode_tbl8 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode_tbl8 +PREHOOK: Output: default@tbl_protectmode_tbl8 POSTHOOK: query: alter table tbl_protectmode_tbl8 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode_tbl8 +POSTHOOK: Output: default@tbl_protectmode_tbl8 POSTHOOK: Output: default@tbl_protectmode_tbl8@p=p1 PREHOOK: query: alter table tbl_protectmode_tbl8 enable no_drop PREHOOK: type: ALTERTABLE_PROTECTMODE @@ -44,9 +46,9 @@ POSTHOOK: Input: default@tbl_protectmode_tbl8 POSTHOOK: Output: default@tbl_protectmode_tbl8 PREHOOK: query: alter table tbl_protectmode_tbl8 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode_tbl8 +PREHOOK: Output: default@tbl_protectmode_tbl8 POSTHOOK: query: alter table tbl_protectmode_tbl8 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode_tbl8 +POSTHOOK: Output: default@tbl_protectmode_tbl8 POSTHOOK: Output: default@tbl_protectmode_tbl8@p=p1 FAILED: SemanticException [Error 30011]: Partition protected from being dropped default@tbl_protectmode_tbl8@p=p1 diff --git a/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out b/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out index 590781c..d451fc7 100644 --- a/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out +++ b/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out @@ -8,8 +8,10 @@ drop table tbl_protectmode__no_drop POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl_protectmode__no_drop (col string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode__no_drop (col string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode__no_drop PREHOOK: query: select * from tbl_protectmode__no_drop PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q.out b/ql/src/test/results/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q.out index 41e83c5..a19f7e6 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,11 +27,14 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part FAILED: SemanticException [Error 10025]: Line 4:7 Expression not in GROUP BY key 'p_mfgr' diff --git a/ql/src/test/results/clientnegative/ptf_negative_AmbiguousWindowDefn.q.out b/ql/src/test/results/clientnegative/ptf_negative_AmbiguousWindowDefn.q.out index 1e50755..0ec7ac1 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_AmbiguousWindowDefn.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_AmbiguousWindowDefn.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,11 +27,14 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part FAILED: SemanticException Cycle in Window references [w3, w3] diff --git a/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out b/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out index 4f7610c..66122a3 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_DistributeByOrderBy.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,6 +27,7 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: ParseException line 5:46 missing ) at 'order' near 'p_mfgr' line 5:61 missing EOF at ')' near 'p_mfgr' diff --git a/ql/src/test/results/clientnegative/ptf_negative_DuplicateWindowAlias.q.out b/ql/src/test/results/clientnegative/ptf_negative_DuplicateWindowAlias.q.out index 6a3a036..4713de3 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_DuplicateWindowAlias.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_DuplicateWindowAlias.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,5 +27,6 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: SemanticException 10:7 Duplicate definition of window w2 is not allowed. Error encountered near token 'w2' diff --git a/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q.out b/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q.out index 7e9a7a2..460d7ae 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,5 +27,6 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: SemanticException HAVING specified without GROUP BY diff --git a/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithPTF.q.out b/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithPTF.q.out index 7e9a7a2..460d7ae 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithPTF.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithPTF.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,5 +27,6 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: SemanticException HAVING specified without GROUP BY diff --git a/ql/src/test/results/clientnegative/ptf_negative_InvalidValueBoundary.q.out b/ql/src/test/results/clientnegative/ptf_negative_InvalidValueBoundary.q.out index 11ea066..5944c1f 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_InvalidValueBoundary.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_InvalidValueBoundary.q.out @@ -15,6 +15,7 @@ PREHOOK: query: CREATE TABLE part( p_complex array ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -28,6 +29,7 @@ POSTHOOK: query: CREATE TABLE part( p_complex array ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: SemanticException Failed to breakup Windowing invocations into Groups. At least 1 group must only depend on input columns. Also check for circular dependencies. Underlying error: Value Boundary expression must be of primitve type. Found: array diff --git a/ql/src/test/results/clientnegative/ptf_negative_JoinWithAmbigousAlias.q.out b/ql/src/test/results/clientnegative/ptf_negative_JoinWithAmbigousAlias.q.out index 2cf9d5d..e939344 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_JoinWithAmbigousAlias.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_JoinWithAmbigousAlias.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,5 +27,6 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: SemanticException [Error 10008]: Line 8:11 Ambiguous table alias 'part' diff --git a/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out b/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out index 090b621..e1771df 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_PartitionBySortBy.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,6 +27,7 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: ParseException line 5:45 missing ) at 'sort' near 'p_mfgr' line 5:59 missing EOF at ')' near 'p_mfgr' diff --git a/ql/src/test/results/clientnegative/ptf_negative_WhereWithRankCond.q.out b/ql/src/test/results/clientnegative/ptf_negative_WhereWithRankCond.q.out index d6ecc90..d2f4eaa 100644 --- a/ql/src/test/results/clientnegative/ptf_negative_WhereWithRankCond.q.out +++ b/ql/src/test/results/clientnegative/ptf_negative_WhereWithRankCond.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,5 +27,6 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: SemanticException [Error 10004]: Line 7:6 Invalid table alias or column reference 'r': (possible column names are: p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment) diff --git a/ql/src/test/results/clientnegative/ptf_window_boundaries.q.out b/ql/src/test/results/clientnegative/ptf_window_boundaries.q.out index de06f0e..477a1ca 100644 --- a/ql/src/test/results/clientnegative/ptf_window_boundaries.q.out +++ b/ql/src/test/results/clientnegative/ptf_window_boundaries.q.out @@ -11,6 +11,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -24,5 +25,6 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: ParseException line 4:44 mismatched input 'following' expecting KW_PRECEDING near 'unbounded' in windowframestartboundary diff --git a/ql/src/test/results/clientnegative/ptf_window_boundaries2.q.out b/ql/src/test/results/clientnegative/ptf_window_boundaries2.q.out index ca935bd..6dcc0fa 100644 --- a/ql/src/test/results/clientnegative/ptf_window_boundaries2.q.out +++ b/ql/src/test/results/clientnegative/ptf_window_boundaries2.q.out @@ -11,6 +11,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -24,5 +25,6 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: ParseException line 4:45 mismatched input 'following' expecting KW_PRECEDING near 'unbounded' in windowframestartboundary diff --git a/ql/src/test/results/clientnegative/recursive_view.q.out b/ql/src/test/results/clientnegative/recursive_view.q.out index 94b968b..fdc5dc8 100644 --- a/ql/src/test/results/clientnegative/recursive_view.q.out +++ b/ql/src/test/results/clientnegative/recursive_view.q.out @@ -24,8 +24,10 @@ POSTHOOK: query: drop view r3 POSTHOOK: type: DROPVIEW PREHOOK: query: create table t (id int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t (id int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t PREHOOK: query: create view r0 as select * from t PREHOOK: type: CREATEVIEW diff --git a/ql/src/test/results/clientnegative/sa_fail_hook3.q.out b/ql/src/test/results/clientnegative/sa_fail_hook3.q.out index cddd1cb..ecc76fb 100644 --- a/ql/src/test/results/clientnegative/sa_fail_hook3.q.out +++ b/ql/src/test/results/clientnegative/sa_fail_hook3.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table mp2 (a string) partitioned by (b string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table mp2 (a string) partitioned by (b string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mp2 PREHOOK: query: alter table mp2 add partition (b='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mp2 +PREHOOK: Output: default@mp2 POSTHOOK: query: alter table mp2 add partition (b='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mp2 +POSTHOOK: Output: default@mp2 POSTHOOK: Output: default@mp2@b=1 PREHOOK: query: alter table mp2 partition (b='1') enable NO_DROP PREHOOK: type: ALTERPARTITION_PROTECTMODE diff --git a/ql/src/test/results/clientnegative/serde_regex.q.out b/ql/src/test/results/clientnegative/serde_regex.q.out index 5f10c37..efe40d4 100644 --- a/ql/src/test/results/clientnegative/serde_regex.q.out +++ b/ql/src/test/results/clientnegative/serde_regex.q.out @@ -19,4 +19,5 @@ WITH SERDEPROPERTIES ( "input.regex" = "([^ ]*) ([^ ]*) ([^ ]*) (-|\\[[^\\]]*\\]) ([^ \"]*|\"[^\"]*\") (-|[0-9]*) (-|[0-9]*)(?: ([^ \"]*|\"[^\"]*\") ([^ \"]*|\"[^\"]*\"))?") STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. java.lang.RuntimeException: MetaException(message:org.apache.hadoop.hive.serde2.SerDeException org.apache.hadoop.hive.serde2.RegexSerDe doesn't allow column [9] named strct with type struct) diff --git a/ql/src/test/results/clientnegative/serde_regex2.q.out b/ql/src/test/results/clientnegative/serde_regex2.q.out index e9e452d..c68f075 100644 --- a/ql/src/test/results/clientnegative/serde_regex2.q.out +++ b/ql/src/test/results/clientnegative/serde_regex2.q.out @@ -19,6 +19,7 @@ WITH SERDEPROPERTIES ( ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Mismatch between the number of matching groups and columns, throw run time exception. Ideally this should throw a compile time exception. See JIRA-3023 for more details. CREATE TABLE serde_regex( host STRING, @@ -36,18 +37,23 @@ WITH SERDEPROPERTIES ( ) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@serde_regex PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@serde_regex POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@serde_regex PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@serde_regex POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@serde_regex PREHOOK: query: -- raise an exception SELECT * FROM serde_regex ORDER BY time diff --git a/ql/src/test/results/clientnegative/serde_regex3.q.out b/ql/src/test/results/clientnegative/serde_regex3.q.out index b959238..4eea704 100644 --- a/ql/src/test/results/clientnegative/serde_regex3.q.out +++ b/ql/src/test/results/clientnegative/serde_regex3.q.out @@ -16,4 +16,5 @@ PREHOOK: query: -- null input.regex, raise an exception ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.RegexSerDe' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. java.lang.RuntimeException: MetaException(message:org.apache.hadoop.hive.serde2.SerDeException This table does not have serde property "input.regex"!) diff --git a/ql/src/test/results/clientnegative/set_table_property.q.out b/ql/src/test/results/clientnegative/set_table_property.q.out index 13c86db..0e44919 100644 --- a/ql/src/test/results/clientnegative/set_table_property.q.out +++ b/ql/src/test/results/clientnegative/set_table_property.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create table testTable(col1 int, col2 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table testTable(col1 int, col2 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@testTable FAILED: ParseException line 4:45 missing StringLiteral at ')' near '' diff --git a/ql/src/test/results/clientnegative/show_columns3.q.out b/ql/src/test/results/clientnegative/show_columns3.q.out index 71af4f3..09068b7 100644 --- a/ql/src/test/results/clientnegative/show_columns3.q.out +++ b/ql/src/test/results/clientnegative/show_columns3.q.out @@ -8,8 +8,10 @@ POSTHOOK: query: USE test_db POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE foo(a INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: CREATE TABLE foo(a INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@foo PREHOOK: query: use default PREHOOK: type: SWITCHDATABASE diff --git a/ql/src/test/results/clientnegative/show_create_table_index.q.out b/ql/src/test/results/clientnegative/show_create_table_index.q.out index f1acfac..162ef9b 100644 --- a/ql/src/test/results/clientnegative/show_create_table_index.q.out +++ b/ql/src/test/results/clientnegative/show_create_table_index.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE tmp_showcrt (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp_showcrt (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_showcrt PREHOOK: query: CREATE INDEX tmp_index on table tmp_showcrt(key) as 'compact' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX diff --git a/ql/src/test/results/clientnegative/smb_bucketmapjoin.q.out b/ql/src/test/results/clientnegative/smb_bucketmapjoin.q.out index a1035fb..0bb7258 100644 --- a/ql/src/test/results/clientnegative/smb_bucketmapjoin.q.out +++ b/ql/src/test/results/clientnegative/smb_bucketmapjoin.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket4_1 PREHOOK: query: CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket4_2 PREHOOK: query: insert overwrite table smb_bucket4_1 select * from src diff --git a/ql/src/test/results/clientnegative/smb_mapjoin_14.q.out b/ql/src/test/results/clientnegative/smb_mapjoin_14.q.out index 70fdad3..1466544 100644 --- a/ql/src/test/results/clientnegative/smb_mapjoin_14.q.out +++ b/ql/src/test/results/clientnegative/smb_mapjoin_14.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: insert overwrite table tbl1 select * from src where key < 10 diff --git a/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out b/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out index c6877d5..1744cb2 100644 --- a/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out +++ b/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out @@ -1,16 +1,20 @@ PREHOOK: query: create table table_asc(key int, value string) CLUSTERED BY (key) SORTED BY (key asc) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_asc(key int, value string) CLUSTERED BY (key) SORTED BY (key asc) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_asc PREHOOK: query: create table table_desc(key int, value string) CLUSTERED BY (key) SORTED BY (key desc) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc(key int, value string) CLUSTERED BY (key) SORTED BY (key desc) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc PREHOOK: query: insert overwrite table table_asc select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/stats_aggregator_error_1.q.out b/ql/src/test/results/clientnegative/stats_aggregator_error_1.q.out index cda9a01..d433b6c 100644 --- a/ql/src/test/results/clientnegative/stats_aggregator_error_1.q.out +++ b/ql/src/test/results/clientnegative/stats_aggregator_error_1.q.out @@ -6,6 +6,7 @@ PREHOOK: query: -- In this test, there is a dummy stats aggregator which throws create table tmptable(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- In this test, there is a dummy stats aggregator which throws an error when the -- method connect is called (as indicated by the parameter hive.test.dummystats.aggregator) -- If stats need not be reliable, the statement succeeds. However, if stats are supposed @@ -14,6 +15,7 @@ POSTHOOK: query: -- In this test, there is a dummy stats aggregator which throws create table tmptable(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: INSERT OVERWRITE TABLE tmptable select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/stats_aggregator_error_2.q.out b/ql/src/test/results/clientnegative/stats_aggregator_error_2.q.out index 301ff46..5727cfe 100644 --- a/ql/src/test/results/clientnegative/stats_aggregator_error_2.q.out +++ b/ql/src/test/results/clientnegative/stats_aggregator_error_2.q.out @@ -5,6 +5,7 @@ PREHOOK: query: -- In this test, the stats aggregator does not exists. create table tmptable(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- In this test, the stats aggregator does not exists. -- If stats need not be reliable, the statement succeeds. However, if stats are supposed -- to be reliable (by setting hive.stats.reliable to true), the insert statement fails @@ -12,6 +13,7 @@ POSTHOOK: query: -- In this test, the stats aggregator does not exists. create table tmptable(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: INSERT OVERWRITE TABLE tmptable select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/stats_noscan_non_native.q.out b/ql/src/test/results/clientnegative/stats_noscan_non_native.q.out index 4b07283..48565f5 100644 --- a/ql/src/test/results/clientnegative/stats_noscan_non_native.q.out +++ b/ql/src/test/results/clientnegative/stats_noscan_non_native.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE non_native1(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE non_native1(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@non_native1 FAILED: SemanticException [Error 10228]: ANALYZE TABLE NOSCAN cannot be used for a non-native table non_native1 diff --git a/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out b/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out index 70a98b4..cee6b53 100644 --- a/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out +++ b/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out @@ -5,6 +5,7 @@ CREATE table analyze_srcpart_partial_scan (key STRING, value STRING) partitioned by (ds string, hr string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test analyze table ... compute statistics partialscan -- 1. prepare data @@ -12,6 +13,7 @@ CREATE table analyze_srcpart_partial_scan (key STRING, value STRING) partitioned by (ds string, hr string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart_partial_scan PREHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/stats_partialscan_non_external.q.out b/ql/src/test/results/clientnegative/stats_partialscan_non_external.q.out index 8bf33b3..7fb1a76 100644 --- a/ql/src/test/results/clientnegative/stats_partialscan_non_external.q.out +++ b/ql/src/test/results/clientnegative/stats_partialscan_non_external.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE EXTERNAL TABLE external_table (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE external_table (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@external_table FAILED: SemanticException [Error 10231]: ANALYZE TABLE PARTIALSCAN doesn't support external table: external_table diff --git a/ql/src/test/results/clientnegative/stats_partialscan_non_native.q.out b/ql/src/test/results/clientnegative/stats_partialscan_non_native.q.out index 2de42a6..1abeff9 100644 --- a/ql/src/test/results/clientnegative/stats_partialscan_non_native.q.out +++ b/ql/src/test/results/clientnegative/stats_partialscan_non_native.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE non_native1(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE non_native1(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@non_native1 FAILED: SemanticException [Error 10229]: ANALYZE TABLE PARTIALSCAN cannot be used for a non-native table non_native1 diff --git a/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out b/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out index 546ebb8..06d5f6c 100644 --- a/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out +++ b/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- test analyze table ... compute statistics partialscan create table analyze_srcpart_partial_scan like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test analyze table ... compute statistics partialscan create table analyze_srcpart_partial_scan like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart_partial_scan PREHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/stats_publisher_error_1.q.out b/ql/src/test/results/clientnegative/stats_publisher_error_1.q.out index 1d4e681..f0bbc2f 100644 --- a/ql/src/test/results/clientnegative/stats_publisher_error_1.q.out +++ b/ql/src/test/results/clientnegative/stats_publisher_error_1.q.out @@ -6,6 +6,7 @@ PREHOOK: query: -- In this test, there is a dummy stats publisher which throws a create table tmptable(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- In this test, there is a dummy stats publisher which throws an error when the -- method connect is called (as indicated by the parameter hive.test.dummystats.publisher) -- If stats need not be reliable, the statement succeeds. However, if stats are supposed @@ -14,6 +15,7 @@ POSTHOOK: query: -- In this test, there is a dummy stats publisher which throws create table tmptable(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: INSERT OVERWRITE TABLE tmptable select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/stats_publisher_error_2.q.out b/ql/src/test/results/clientnegative/stats_publisher_error_2.q.out index 94bb200..2ff15eb 100644 --- a/ql/src/test/results/clientnegative/stats_publisher_error_2.q.out +++ b/ql/src/test/results/clientnegative/stats_publisher_error_2.q.out @@ -5,6 +5,7 @@ PREHOOK: query: -- In this test, the stats publisher does not exists. create table tmptable(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- In this test, the stats publisher does not exists. -- If stats need not be reliable, the statement succeeds. However, if stats are supposed -- to be reliable (by setting hive.stats.reliable to true), the insert statement fails @@ -12,6 +13,7 @@ POSTHOOK: query: -- In this test, the stats publisher does not exists. create table tmptable(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: INSERT OVERWRITE TABLE tmptable select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/subquery_nested_subquery.q.out b/ql/src/test/results/clientnegative/subquery_nested_subquery.q.out index 68a3a98..4950ec9 100644 --- a/ql/src/test/results/clientnegative/subquery_nested_subquery.q.out +++ b/ql/src/test/results/clientnegative/subquery_nested_subquery.q.out @@ -10,6 +10,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -22,6 +23,7 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: SemanticException Line 5:53 Unsupported SubQuery Expression 'p_name' in definition of SubQuery sq_1 [ x.p_name in (select y.p_name from part y where exists (select z.p_name from part z where y.p_name = z.p_name)) diff --git a/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out b/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out index 3cc2fa4..d45f8f1 100644 --- a/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out +++ b/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part FAILED: SemanticException Line 9:8 Unsupported SubQuery Expression '1' in definition of SubQuery sq_1 [ a.p_size in diff --git a/ql/src/test/results/clientnegative/truncate_bucketed_column.q.out b/ql/src/test/results/clientnegative/truncate_bucketed_column.q.out index 480793b..edad90c 100644 --- a/ql/src/test/results/clientnegative/truncate_bucketed_column.q.out +++ b/ql/src/test/results/clientnegative/truncate_bucketed_column.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Tests truncating a bucketed column CREATE TABLE test_tab (key STRING, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests truncating a bucketed column CREATE TABLE test_tab (key STRING, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: INSERT OVERWRITE TABLE test_tab SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/truncate_column_indexed_table.q.out b/ql/src/test/results/clientnegative/truncate_column_indexed_table.q.out index c1badb2..76cf8f0 100644 --- a/ql/src/test/results/clientnegative/truncate_column_indexed_table.q.out +++ b/ql/src/test/results/clientnegative/truncate_column_indexed_table.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Tests truncating a column from an indexed table CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests truncating a column from an indexed table CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: INSERT OVERWRITE TABLE test_tab SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/truncate_column_list_bucketing.q.out b/ql/src/test/results/clientnegative/truncate_column_list_bucketing.q.out index eef3390..bf08bcc 100644 --- a/ql/src/test/results/clientnegative/truncate_column_list_bucketing.q.out +++ b/ql/src/test/results/clientnegative/truncate_column_list_bucketing.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Tests truncating a column on which a table is list bucketed CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests truncating a column on which a table is list bucketed CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: ALTER TABLE test_tab SKEWED BY (key) ON ("484") diff --git a/ql/src/test/results/clientnegative/truncate_column_seqfile.q.out b/ql/src/test/results/clientnegative/truncate_column_seqfile.q.out index cd3b11a..9e0aa2d 100644 --- a/ql/src/test/results/clientnegative/truncate_column_seqfile.q.out +++ b/ql/src/test/results/clientnegative/truncate_column_seqfile.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Tests truncating a column from a table stored as a sequence f CREATE TABLE test_tab (key STRING, value STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests truncating a column from a table stored as a sequence file CREATE TABLE test_tab (key STRING, value STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: INSERT OVERWRITE TABLE test_tab SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/truncate_nonexistant_column.q.out b/ql/src/test/results/clientnegative/truncate_nonexistant_column.q.out index f1af3e6..028b25c 100644 --- a/ql/src/test/results/clientnegative/truncate_nonexistant_column.q.out +++ b/ql/src/test/results/clientnegative/truncate_nonexistant_column.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Tests attempting to truncate a column in a table that doesn't CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests attempting to truncate a column in a table that doesn't exist CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: INSERT OVERWRITE TABLE test_tab SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/truncate_partition_column.q.out b/ql/src/test/results/clientnegative/truncate_partition_column.q.out index 17dd2fb..b47029f 100644 --- a/ql/src/test/results/clientnegative/truncate_partition_column.q.out +++ b/ql/src/test/results/clientnegative/truncate_partition_column.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Tests truncating a partition column CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests truncating a partition column CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: INSERT OVERWRITE TABLE test_tab PARTITION (part = '1') SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/truncate_partition_column2.q.out b/ql/src/test/results/clientnegative/truncate_partition_column2.q.out index 889d5f2..1a81847 100644 --- a/ql/src/test/results/clientnegative/truncate_partition_column2.q.out +++ b/ql/src/test/results/clientnegative/truncate_partition_column2.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Tests truncating a partition column CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests truncating a partition column CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: INSERT OVERWRITE TABLE test_tab PARTITION (part = '1') SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientnegative/truncate_table_failure3.q.out b/ql/src/test/results/clientnegative/truncate_table_failure3.q.out index 1f6f2b6..fafa821 100644 --- a/ql/src/test/results/clientnegative/truncate_table_failure3.q.out +++ b/ql/src/test/results/clientnegative/truncate_table_failure3.q.out @@ -1,6 +1,8 @@ PREHOOK: query: create external table external1 (a int, b int) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create external table external1 (a int, b int) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@external1 FAILED: SemanticException [Error 10146]: Cannot truncate non-managed table external1. diff --git a/ql/src/test/results/clientnegative/truncate_table_failure4.q.out b/ql/src/test/results/clientnegative/truncate_table_failure4.q.out index d719c7d..1a85ffb 100644 --- a/ql/src/test/results/clientnegative/truncate_table_failure4.q.out +++ b/ql/src/test/results/clientnegative/truncate_table_failure4.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE non_native(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE non_native(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@non_native FAILED: SemanticException [Error 10147]: Cannot truncate non-native table non_native. diff --git a/ql/src/test/results/clientnegative/union2.q.out b/ql/src/test/results/clientnegative/union2.q.out index db3804e..cc14124 100644 --- a/ql/src/test/results/clientnegative/union2.q.out +++ b/ql/src/test/results/clientnegative/union2.q.out @@ -1,11 +1,15 @@ PREHOOK: query: create table if not exists union2_t1(r string, c string, v array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists union2_t1(r string, c string, v array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@union2_t1 PREHOOK: query: create table if not exists union2_t2(s string, c string, v string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists union2_t2(s string, c string, v string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@union2_t2 FAILED: SemanticException 8:47 Schema of both sides of union should match: Column v is of type array on first table and type double on second table. Error encountered near token 'union2_t2' diff --git a/ql/src/test/results/clientnegative/union22.q.out b/ql/src/test/results/clientnegative/union22.q.out index e85cf75..96c5824 100644 --- a/ql/src/test/results/clientnegative/union22.q.out +++ b/ql/src/test/results/clientnegative/union22.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table dst_union22(k1 string, k2 string, k3 string, k4 string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dst_union22(k1 string, k2 string, k3 string, k4 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dst_union22 PREHOOK: query: create table dst_union22_delta(k0 string, k1 string, k2 string, k3 string, k4 string, k5 string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dst_union22_delta(k0 string, k1 string, k2 string, k3 string, k4 string, k5 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dst_union22_delta PREHOOK: query: insert overwrite table dst_union22 partition (ds='1') select key, value, key , value from src diff --git a/ql/src/test/results/clientnegative/union3.q.out b/ql/src/test/results/clientnegative/union3.q.out index 61d10e4..1d73063 100644 --- a/ql/src/test/results/clientnegative/union3.q.out +++ b/ql/src/test/results/clientnegative/union3.q.out @@ -2,9 +2,11 @@ PREHOOK: query: -- Ensure that UNION ALL columns are in the correct order on bot -- Ensure that the appropriate error message is propagated CREATE TABLE IF NOT EXISTS union3 (bar int, baz int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Ensure that UNION ALL columns are in the correct order on both sides -- Ensure that the appropriate error message is propagated CREATE TABLE IF NOT EXISTS union3 (bar int, baz int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@union3 FAILED: SemanticException 2:85 Schema of both sides of union should match: field bar: appears on the left side of the UNION at column position: 0, and on the right side of the UNION at column position: 1. Column positions should match for a UNION. Error encountered near token 'union3' diff --git a/ql/src/test/results/clientnegative/unset_table_property.q.out b/ql/src/test/results/clientnegative/unset_table_property.q.out index ac2b8d4..fe69b6f 100644 --- a/ql/src/test/results/clientnegative/unset_table_property.q.out +++ b/ql/src/test/results/clientnegative/unset_table_property.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE testTable(col1 INT, col2 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE testTable(col1 INT, col2 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@testTable PREHOOK: query: ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3') PREHOOK: type: ALTERTABLE_PROPERTIES diff --git a/ql/src/test/results/clientnegative/windowing_leadlag_in_udaf.q.out b/ql/src/test/results/clientnegative/windowing_leadlag_in_udaf.q.out index a81028c..a7e02f9 100644 --- a/ql/src/test/results/clientnegative/windowing_leadlag_in_udaf.q.out +++ b/ql/src/test/results/clientnegative/windowing_leadlag_in_udaf.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,5 +27,6 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: SemanticException [Error 10247]: Missing over clause for function : sum diff --git a/ql/src/test/results/clientnegative/windowing_ll_no_neg.q.out b/ql/src/test/results/clientnegative/windowing_ll_no_neg.q.out index 240b04e..c2bf9cf 100644 --- a/ql/src/test/results/clientnegative/windowing_ll_no_neg.q.out +++ b/ql/src/test/results/clientnegative/windowing_ll_no_neg.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part FAILED: SemanticException Failed to breakup Windowing invocations into Groups. At least 1 group must only depend on input columns. Also check for circular dependencies. Underlying error: org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException: Lag amount can not be nagative. Specified: -1 diff --git a/ql/src/test/results/clientnegative/windowing_ll_no_over.q.out b/ql/src/test/results/clientnegative/windowing_ll_no_over.q.out index 8c913d5..746e90b 100644 --- a/ql/src/test/results/clientnegative/windowing_ll_no_over.q.out +++ b/ql/src/test/results/clientnegative/windowing_ll_no_over.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -26,5 +27,6 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part FAILED: SemanticException [Error 10247]: Missing over clause for function : lead diff --git a/ql/src/test/results/clientnegative/wrong_column_type.q.out b/ql/src/test/results/clientnegative/wrong_column_type.q.out index c30fe20..67619c2 100644 --- a/ql/src/test/results/clientnegative/wrong_column_type.q.out +++ b/ql/src/test/results/clientnegative/wrong_column_type.q.out @@ -1,6 +1,8 @@ PREHOOK: query: CREATE TABLE dest1(a float) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(a float) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 FAILED: NoMatchingMethodException No matching method for class org.apache.hadoop.hive.ql.udf.UDFToFloat with (array). Possible choices: _FUNC_(bigint) _FUNC_(boolean) _FUNC_(decimal(38,18)) _FUNC_(double) _FUNC_(int) _FUNC_(smallint) _FUNC_(string) _FUNC_(timestamp) _FUNC_(tinyint) _FUNC_(void) diff --git a/ql/src/test/results/clientpositive/add_part_exist.q.out b/ql/src/test/results/clientpositive/add_part_exist.q.out index 19fc864..86f17fb 100644 --- a/ql/src/test/results/clientpositive/add_part_exist.q.out +++ b/ql/src/test/results/clientpositive/add_part_exist.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@add_part_test PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS @@ -9,10 +11,10 @@ POSTHOOK: query: SHOW PARTITIONS add_part_test POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE add_part_test ADD PARTITION (ds='2010-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@add_part_test +PREHOOK: Output: default@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD PARTITION (ds='2010-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@add_part_test +POSTHOOK: Output: default@add_part_test POSTHOOK: Output: default@add_part_test@ds=2010-01-01 PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS @@ -21,10 +23,10 @@ POSTHOOK: type: SHOWPARTITIONS ds=2010-01-01 PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@add_part_test +PREHOOK: Output: default@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@add_part_test +POSTHOOK: Output: default@add_part_test PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS POSTHOOK: query: SHOW PARTITIONS add_part_test @@ -32,10 +34,10 @@ POSTHOOK: type: SHOWPARTITIONS ds=2010-01-01 PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@add_part_test +PREHOOK: Output: default@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@add_part_test +POSTHOOK: Output: default@add_part_test POSTHOOK: Output: default@add_part_test@ds=2010-01-02 PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS @@ -45,10 +47,10 @@ ds=2010-01-01 ds=2010-01-02 PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITION (ds='2010-01-02') PARTITION (ds='2010-01-03') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@add_part_test +PREHOOK: Output: default@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITION (ds='2010-01-02') PARTITION (ds='2010-01-03') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@add_part_test +POSTHOOK: Output: default@add_part_test POSTHOOK: Output: default@add_part_test@ds=2010-01-03 PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS @@ -94,19 +96,21 @@ POSTHOOK: query: SHOW TABLES POSTHOOK: type: SHOWTABLES PREHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:add_part_test_db POSTHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: add_part_test_db@add_part_test +POSTHOOK: Output: database:add_part_test_db PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS POSTHOOK: query: SHOW PARTITIONS add_part_test POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE add_part_test ADD PARTITION (ds='2010-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: add_part_test_db@add_part_test +PREHOOK: Output: add_part_test_db@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD PARTITION (ds='2010-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: add_part_test_db@add_part_test +POSTHOOK: Output: add_part_test_db@add_part_test POSTHOOK: Output: add_part_test_db@add_part_test@ds=2010-01-01 PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS @@ -115,10 +119,10 @@ POSTHOOK: type: SHOWPARTITIONS ds=2010-01-01 PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: add_part_test_db@add_part_test +PREHOOK: Output: add_part_test_db@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: add_part_test_db@add_part_test +POSTHOOK: Output: add_part_test_db@add_part_test PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS POSTHOOK: query: SHOW PARTITIONS add_part_test @@ -126,10 +130,10 @@ POSTHOOK: type: SHOWPARTITIONS ds=2010-01-01 PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: add_part_test_db@add_part_test +PREHOOK: Output: add_part_test_db@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: add_part_test_db@add_part_test +POSTHOOK: Output: add_part_test_db@add_part_test POSTHOOK: Output: add_part_test_db@add_part_test@ds=2010-01-02 PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS @@ -139,10 +143,10 @@ ds=2010-01-01 ds=2010-01-02 PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITION (ds='2010-01-02') PARTITION (ds='2010-01-03') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: add_part_test_db@add_part_test +PREHOOK: Output: add_part_test_db@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITION (ds='2010-01-02') PARTITION (ds='2010-01-03') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: add_part_test_db@add_part_test +POSTHOOK: Output: add_part_test_db@add_part_test POSTHOOK: Output: add_part_test_db@add_part_test@ds=2010-01-03 PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/add_part_multiple.q.out b/ql/src/test/results/clientpositive/add_part_multiple.q.out index b8de0d4..e2390a1 100644 --- a/ql/src/test/results/clientpositive/add_part_multiple.q.out +++ b/ql/src/test/results/clientpositive/add_part_multiple.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- HIVE-5122 locations for 2nd, 3rd... partition are ignored CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-5122 locations for 2nd, 3rd... partition are ignored CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@add_part_test PREHOOK: query: explain ALTER TABLE add_part_test ADD IF NOT EXISTS @@ -36,14 +38,20 @@ PARTITION (ds='2010-02-01') location 'B' PARTITION (ds='2010-03-01') PARTITION (ds='2010-04-01') location 'C' PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@add_part_test +PREHOOK: Input: A +PREHOOK: Input: B +PREHOOK: Input: C +PREHOOK: Output: default@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') location 'A' PARTITION (ds='2010-02-01') location 'B' PARTITION (ds='2010-03-01') PARTITION (ds='2010-04-01') location 'C' POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@add_part_test +POSTHOOK: Input: A +POSTHOOK: Input: B +POSTHOOK: Input: C +POSTHOOK: Output: default@add_part_test POSTHOOK: Output: default@add_part_test@ds=2010-01-01 POSTHOOK: Output: default@add_part_test@ds=2010-02-01 POSTHOOK: Output: default@add_part_test@ds=2010-03-01 diff --git a/ql/src/test/results/clientpositive/add_partition_no_whitelist.q.out b/ql/src/test/results/clientpositive/add_partition_no_whitelist.q.out index 84ee355..aaa8336 100644 --- a/ql/src/test/results/clientpositive/add_partition_no_whitelist.q.out +++ b/ql/src/test/results/clientpositive/add_partition_no_whitelist.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Test with no partition name whitelist pattern CREATE TABLE part_nowhitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test with no partition name whitelist pattern CREATE TABLE part_nowhitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_nowhitelist_test PREHOOK: query: SHOW PARTITIONS part_nowhitelist_test PREHOOK: type: SHOWPARTITIONS @@ -13,8 +15,8 @@ POSTHOOK: query: SHOW PARTITIONS part_nowhitelist_test POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE part_nowhitelist_test ADD PARTITION (ds='1,2,3,4') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@part_nowhitelist_test +PREHOOK: Output: default@part_nowhitelist_test POSTHOOK: query: ALTER TABLE part_nowhitelist_test ADD PARTITION (ds='1,2,3,4') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@part_nowhitelist_test +POSTHOOK: Output: default@part_nowhitelist_test POSTHOOK: Output: default@part_nowhitelist_test@ds=1,2,3,4 diff --git a/ql/src/test/results/clientpositive/add_partition_with_whitelist.q.out b/ql/src/test/results/clientpositive/add_partition_with_whitelist.q.out index 75c60ba..33085a5 100644 --- a/ql/src/test/results/clientpositive/add_partition_with_whitelist.q.out +++ b/ql/src/test/results/clientpositive/add_partition_with_whitelist.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- This pattern matches only letters. CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This pattern matches only letters. CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_whitelist_test PREHOOK: query: SHOW PARTITIONS part_whitelist_test PREHOOK: type: SHOWPARTITIONS @@ -13,8 +15,8 @@ POSTHOOK: query: SHOW PARTITIONS part_whitelist_test POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE part_whitelist_test ADD PARTITION (ds='Part') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@part_whitelist_test +PREHOOK: Output: default@part_whitelist_test POSTHOOK: query: ALTER TABLE part_whitelist_test ADD PARTITION (ds='Part') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@part_whitelist_test +POSTHOOK: Output: default@part_whitelist_test POSTHOOK: Output: default@part_whitelist_test@ds=Part diff --git a/ql/src/test/results/clientpositive/alter1.q.out b/ql/src/test/results/clientpositive/alter1.q.out index c4bca4a..2b5ddba 100644 --- a/ql/src/test/results/clientpositive/alter1.q.out +++ b/ql/src/test/results/clientpositive/alter1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table alter1(a int, b int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter1(a int, b int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter1 PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE @@ -195,9 +197,11 @@ POSTHOOK: query: SHOW TABLES POSTHOOK: type: SHOWTABLES PREHOOK: query: CREATE TABLE alter1(a INT, b INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter1_db POSTHOOK: query: CREATE TABLE alter1(a INT, b INT) POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter1_db@alter1 +POSTHOOK: Output: database:alter1_db PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 diff --git a/ql/src/test/results/clientpositive/alter2.q.out b/ql/src/test/results/clientpositive/alter2.q.out index acfd993..54fa503 100644 --- a/ql/src/test/results/clientpositive/alter2.q.out +++ b/ql/src/test/results/clientpositive/alter2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table alter2(a int, b int) partitioned by (insertdate string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter2(a int, b int) partitioned by (insertdate string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter2 PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE @@ -23,10 +25,12 @@ POSTHOOK: query: show partitions alter2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: alter table alter2 add partition (insertdate='2008-01-01') location '2008/01/01' PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@alter2 +PREHOOK: Input: 2008/01/01 +PREHOOK: Output: default@alter2 POSTHOOK: query: alter table alter2 add partition (insertdate='2008-01-01') location '2008/01/01' POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@alter2 +POSTHOOK: Input: 2008/01/01 +POSTHOOK: Output: default@alter2 POSTHOOK: Output: default@alter2@insertdate=2008-01-01 PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE @@ -49,10 +53,12 @@ POSTHOOK: type: SHOWPARTITIONS insertdate=2008-01-01 PREHOOK: query: alter table alter2 add partition (insertdate='2008-01-02') location '2008/01/02' PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@alter2 +PREHOOK: Input: 2008/01/02 +PREHOOK: Output: default@alter2 POSTHOOK: query: alter table alter2 add partition (insertdate='2008-01-02') location '2008/01/02' POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@alter2 +POSTHOOK: Input: 2008/01/02 +POSTHOOK: Output: default@alter2 POSTHOOK: Output: default@alter2@insertdate=2008-01-02 PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE @@ -84,8 +90,10 @@ POSTHOOK: Input: default@alter2 POSTHOOK: Output: default@alter2 PREHOOK: query: create external table alter2(a int, b int) partitioned by (insertdate string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create external table alter2(a int, b int) partitioned by (insertdate string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter2 PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE @@ -107,10 +115,12 @@ POSTHOOK: query: show partitions alter2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: alter table alter2 add partition (insertdate='2008-01-01') location '2008/01/01' PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@alter2 +PREHOOK: Input: 2008/01/01 +PREHOOK: Output: default@alter2 POSTHOOK: query: alter table alter2 add partition (insertdate='2008-01-01') location '2008/01/01' POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@alter2 +POSTHOOK: Input: 2008/01/01 +POSTHOOK: Output: default@alter2 POSTHOOK: Output: default@alter2@insertdate=2008-01-01 PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE @@ -133,10 +143,12 @@ POSTHOOK: type: SHOWPARTITIONS insertdate=2008-01-01 PREHOOK: query: alter table alter2 add partition (insertdate='2008-01-02') location '2008/01/02' PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@alter2 +PREHOOK: Input: 2008/01/02 +PREHOOK: Output: default@alter2 POSTHOOK: query: alter table alter2 add partition (insertdate='2008-01-02') location '2008/01/02' POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@alter2 +POSTHOOK: Input: 2008/01/02 +POSTHOOK: Output: default@alter2 POSTHOOK: Output: default@alter2@insertdate=2008-01-02 PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE @@ -199,9 +211,11 @@ POSTHOOK: query: SHOW TABLES POSTHOOK: type: SHOWTABLES PREHOOK: query: CREATE TABLE alter2(a int, b int) PARTITIONED BY (insertdate string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter2_db POSTHOOK: query: CREATE TABLE alter2(a int, b int) PARTITIONED BY (insertdate string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter2_db@alter2 +POSTHOOK: Output: database:alter2_db PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 @@ -222,10 +236,12 @@ POSTHOOK: query: SHOW PARTITIONS alter2 POSTHOOK: type: SHOWPARTITIONS #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: alter2_db@alter2 +PREHOOK: Input: 2008/01/01 +PREHOOK: Output: alter2_db@alter2 #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: alter2_db@alter2 +POSTHOOK: Input: 2008/01/01 +POSTHOOK: Output: alter2_db@alter2 POSTHOOK: Output: alter2_db@alter2@insertdate=2008-01-01 PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE @@ -248,10 +264,12 @@ POSTHOOK: type: SHOWPARTITIONS insertdate=2008-01-01 #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: alter2_db@alter2 +PREHOOK: Input: 2008/01/02 +PREHOOK: Output: alter2_db@alter2 #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: alter2_db@alter2 +POSTHOOK: Input: 2008/01/02 +POSTHOOK: Output: alter2_db@alter2 POSTHOOK: Output: alter2_db@alter2@insertdate=2008-01-02 PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE @@ -283,9 +301,11 @@ POSTHOOK: Input: alter2_db@alter2 POSTHOOK: Output: alter2_db@alter2 PREHOOK: query: CREATE EXTERNAL TABLE alter2(a int, b int) PARTITIONED BY (insertdate string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter2_db POSTHOOK: query: CREATE EXTERNAL TABLE alter2(a int, b int) PARTITIONED BY (insertdate string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter2_db@alter2 +POSTHOOK: Output: database:alter2_db PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 @@ -306,10 +326,12 @@ POSTHOOK: query: SHOW PARTITIONS alter2 POSTHOOK: type: SHOWPARTITIONS #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: alter2_db@alter2 +PREHOOK: Input: 2008/01/01 +PREHOOK: Output: alter2_db@alter2 #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: alter2_db@alter2 +POSTHOOK: Input: 2008/01/01 +POSTHOOK: Output: alter2_db@alter2 POSTHOOK: Output: alter2_db@alter2@insertdate=2008-01-01 PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE @@ -332,10 +354,12 @@ POSTHOOK: type: SHOWPARTITIONS insertdate=2008-01-01 #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: alter2_db@alter2 +PREHOOK: Input: 2008/01/02 +PREHOOK: Output: alter2_db@alter2 #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: alter2_db@alter2 +POSTHOOK: Input: 2008/01/02 +POSTHOOK: Output: alter2_db@alter2 POSTHOOK: Output: alter2_db@alter2@insertdate=2008-01-02 PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/alter3.q.out b/ql/src/test/results/clientpositive/alter3.q.out index 96e8191..f13e0e4 100644 --- a/ql/src/test/results/clientpositive/alter3.q.out +++ b/ql/src/test/results/clientpositive/alter3.q.out @@ -1,23 +1,31 @@ PREHOOK: query: create table alter3_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter3_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter3_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter3_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter3_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter3_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter3_src PREHOOK: query: create table alter3 ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter3 ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter3 PREHOOK: query: create table alter3_like like alter3 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter3_like like alter3 POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter3_like PREHOOK: query: insert overwrite table alter3 partition (pCol1='test_part:', pcol2='test_part:') select col1 from alter3_src PREHOOK: type: QUERY @@ -217,31 +225,39 @@ POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMP POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: CREATE TABLE alter3_src (col1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter3_db POSTHOOK: query: CREATE TABLE alter3_src (col1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter3_db@alter3_src +POSTHOOK: Output: database:alter3_db POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/test.dat' OVERWRITE INTO TABLE alter3_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: alter3_db@alter3_src POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/test.dat' OVERWRITE INTO TABLE alter3_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: alter3_db@alter3_src POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: CREATE TABLE alter3 (col1 STRING) PARTITIONED BY (pcol1 STRING, pcol2 STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter3_db POSTHOOK: query: CREATE TABLE alter3 (col1 STRING) PARTITIONED BY (pcol1 STRING, pcol2 STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter3_db@alter3 +POSTHOOK: Output: database:alter3_db POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: CREATE TABLE alter3_like LIKE alter3 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter3_db POSTHOOK: query: CREATE TABLE alter3_like LIKE alter3 POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter3_db@alter3_like +POSTHOOK: Output: database:alter3_db POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: INSERT OVERWRITE TABLE alter3 PARTITION (pCol1='test_part:', pcol2='test_part:') SELECT col1 FROM alter3_src diff --git a/ql/src/test/results/clientpositive/alter4.q.out b/ql/src/test/results/clientpositive/alter4.q.out index 7e9e689..001b922 100644 --- a/ql/src/test/results/clientpositive/alter4.q.out +++ b/ql/src/test/results/clientpositive/alter4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE set_bucketing_test (key INT, value STRING) CLUSTERED BY (key) INTO 10 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE set_bucketing_test (key INT, value STRING) CLUSTERED BY (key) INTO 10 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@set_bucketing_test PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE @@ -68,9 +70,11 @@ POSTHOOK: query: SHOW TABLES POSTHOOK: type: SHOWTABLES PREHOOK: query: CREATE TABLE set_bucketing_test (key INT, value STRING) CLUSTERED BY (key) INTO 10 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter4_db POSTHOOK: query: CREATE TABLE set_bucketing_test (key INT, value STRING) CLUSTERED BY (key) INTO 10 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter4_db@set_bucketing_test +POSTHOOK: Output: database:alter4_db PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test diff --git a/ql/src/test/results/clientpositive/alter5.q.out b/ql/src/test/results/clientpositive/alter5.q.out index 0241a62..d36d40b 100644 --- a/ql/src/test/results/clientpositive/alter5.q.out +++ b/ql/src/test/results/clientpositive/alter5.q.out @@ -4,23 +4,29 @@ PREHOOK: query: -- create table alter5_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- Added to validate the fix for HIVE-2117 - explicit partition location -- create table alter5_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter5_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter5_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter5_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter5_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter5_src PREHOOK: query: create table alter5 ( col1 string ) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter5 ( col1 string ) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter5 PREHOOK: query: -- -- Here's the interesting bit for HIVE-2117 - partition subdir should be @@ -28,14 +34,16 @@ PREHOOK: query: -- -- alter table alter5 add partition (dt='a') location 'parta' PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@alter5 +PREHOOK: Input: parta +PREHOOK: Output: default@alter5 POSTHOOK: query: -- -- Here's the interesting bit for HIVE-2117 - partition subdir should be -- named "parta". -- alter table alter5 add partition (dt='a') location 'parta' POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@alter5 +POSTHOOK: Input: parta +POSTHOOK: Output: default@alter5 POSTHOOK: Output: default@alter5@dt=a PREHOOK: query: describe extended alter5 partition (dt='a') PREHOOK: type: DESCTABLE @@ -145,29 +153,37 @@ POSTHOOK: type: SHOWTABLES POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: create table alter5_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter5_db POSTHOOK: query: create table alter5_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter5_db@alter5_src +POSTHOOK: Output: database:alter5_db POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter5_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: alter5_db@alter5_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter5_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: alter5_db@alter5_src POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: create table alter5 ( col1 string ) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter5_db POSTHOOK: query: create table alter5 ( col1 string ) partitioned by (dt string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter5_db@alter5 +POSTHOOK: Output: database:alter5_db POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: alter table alter5 add partition (dt='a') location 'parta' PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: alter5_db@alter5 +PREHOOK: Input: parta +PREHOOK: Output: alter5_db@alter5 POSTHOOK: query: alter table alter5 add partition (dt='a') location 'parta' POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: alter5_db@alter5 +POSTHOOK: Input: parta +POSTHOOK: Output: alter5_db@alter5 POSTHOOK: Output: alter5_db@alter5@dt=a POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: describe extended alter5 partition (dt='a') diff --git a/ql/src/test/results/clientpositive/alter_char1.q.out b/ql/src/test/results/clientpositive/alter_char1.q.out index 1491ed8..643c0dc 100644 --- a/ql/src/test/results/clientpositive/alter_char1.q.out +++ b/ql/src/test/results/clientpositive/alter_char1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table alter_char_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table alter_char_1 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_char_1 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_char_1 PREHOOK: query: insert overwrite table alter_char_1 select key, value from src order by key limit 5 diff --git a/ql/src/test/results/clientpositive/alter_char2.q.out b/ql/src/test/results/clientpositive/alter_char2.q.out index 28e9368..7e05af7 100644 --- a/ql/src/test/results/clientpositive/alter_char2.q.out +++ b/ql/src/test/results/clientpositive/alter_char2.q.out @@ -8,10 +8,12 @@ PREHOOK: query: create table alter_char2 ( c1 char(255) ) partitioned by (hr int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_char2 ( c1 char(255) ) partitioned by (hr int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_char2 PREHOOK: query: insert overwrite table alter_char2 partition (hr=1) select value from src limit 1 diff --git a/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out b/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out index 570649e..20af0c7 100644 --- a/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out +++ b/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out @@ -1,25 +1,33 @@ PREHOOK: query: create table src_rc_concatenate_test(key int, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_rc_concatenate_test(key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_rc_concatenate_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_concatenate_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_concatenate_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_concatenate_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_concatenate_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_concatenate_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_concatenate_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_concatenate_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_concatenate_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_concatenate_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_concatenate_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_concatenate_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_concatenate_test PREHOOK: query: show table extended like `src_rc_concatenate_test` PREHOOK: type: SHOW_TABLESTATUS @@ -115,33 +123,41 @@ POSTHOOK: query: drop index src_rc_concatenate_test_index on src_rc_concatenate_ POSTHOOK: type: DROPINDEX PREHOOK: query: create table src_rc_concatenate_test_part(key int, value string) partitioned by (ds string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_rc_concatenate_test_part(key int, value string) partitioned by (ds string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_rc_concatenate_test_part PREHOOK: query: alter table src_rc_concatenate_test_part add partition (ds='2011') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@src_rc_concatenate_test_part +PREHOOK: Output: default@src_rc_concatenate_test_part POSTHOOK: query: alter table src_rc_concatenate_test_part add partition (ds='2011') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@src_rc_concatenate_test_part +POSTHOOK: Output: default@src_rc_concatenate_test_part POSTHOOK: Output: default@src_rc_concatenate_test_part@ds=2011 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_concatenate_test_part partition (ds='2011') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_concatenate_test_part@ds=2011 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_concatenate_test_part partition (ds='2011') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_concatenate_test_part@ds=2011 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_concatenate_test_part partition (ds='2011') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_concatenate_test_part@ds=2011 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_concatenate_test_part partition (ds='2011') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_concatenate_test_part@ds=2011 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_concatenate_test_part partition (ds='2011') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_concatenate_test_part@ds=2011 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_concatenate_test_part partition (ds='2011') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_concatenate_test_part@ds=2011 PREHOOK: query: show table extended like `src_rc_concatenate_test_part` partition (ds='2011') PREHOOK: type: SHOW_TABLESTATUS diff --git a/ql/src/test/results/clientpositive/alter_merge.q.out b/ql/src/test/results/clientpositive/alter_merge.q.out index c296b81..a35313e 100644 --- a/ql/src/test/results/clientpositive/alter_merge.q.out +++ b/ql/src/test/results/clientpositive/alter_merge.q.out @@ -1,25 +1,33 @@ PREHOOK: query: create table src_rc_merge_test(key int, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_rc_merge_test(key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_rc_merge_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test PREHOOK: query: show table extended like `src_rc_merge_test` PREHOOK: type: SHOW_TABLESTATUS @@ -101,33 +109,41 @@ POSTHOOK: Input: default@src_rc_merge_test 214 -7678496319 PREHOOK: query: create table src_rc_merge_test_part(key int, value string) partitioned by (ds string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_rc_merge_test_part(key int, value string) partitioned by (ds string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_rc_merge_test_part PREHOOK: query: alter table src_rc_merge_test_part add partition (ds='2011') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@src_rc_merge_test_part +PREHOOK: Output: default@src_rc_merge_test_part POSTHOOK: query: alter table src_rc_merge_test_part add partition (ds='2011') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@src_rc_merge_test_part +POSTHOOK: Output: default@src_rc_merge_test_part POSTHOOK: Output: default@src_rc_merge_test_part@ds=2011 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test_part partition (ds='2011') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_part@ds=2011 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test_part partition (ds='2011') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_part@ds=2011 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test_part partition (ds='2011') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_part@ds=2011 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test_part partition (ds='2011') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_part@ds=2011 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test_part partition (ds='2011') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_part@ds=2011 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test_part partition (ds='2011') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_part@ds=2011 PREHOOK: query: show table extended like `src_rc_merge_test_part` partition (ds='2011') PREHOOK: type: SHOW_TABLESTATUS diff --git a/ql/src/test/results/clientpositive/alter_merge_2.q.out b/ql/src/test/results/clientpositive/alter_merge_2.q.out index 1081b93..12c3b09 100644 --- a/ql/src/test/results/clientpositive/alter_merge_2.q.out +++ b/ql/src/test/results/clientpositive/alter_merge_2.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table src_rc_merge_test_part(key int, value string) partitioned by (ds string, ts string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_rc_merge_test_part(key int, value string) partitioned by (ds string, ts string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_rc_merge_test_part PREHOOK: query: alter table src_rc_merge_test_part add partition (ds='2012-01-03', ts='2012-01-03+14:46:31') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@src_rc_merge_test_part +PREHOOK: Output: default@src_rc_merge_test_part POSTHOOK: query: alter table src_rc_merge_test_part add partition (ds='2012-01-03', ts='2012-01-03+14:46:31') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@src_rc_merge_test_part +POSTHOOK: Output: default@src_rc_merge_test_part POSTHOOK: Output: default@src_rc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 PREHOOK: query: desc extended src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') PREHOOK: type: DESCTABLE @@ -28,21 +30,27 @@ ts string None #### A masked pattern was here #### PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 PREHOOK: query: select count(1) from src_rc_merge_test_part where ds='2012-01-03' and ts='2012-01-03+14:46:31' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/alter_merge_stats.q.out b/ql/src/test/results/clientpositive/alter_merge_stats.q.out index dcdf2b1..0dc693d 100644 --- a/ql/src/test/results/clientpositive/alter_merge_stats.q.out +++ b/ql/src/test/results/clientpositive/alter_merge_stats.q.out @@ -1,25 +1,33 @@ PREHOOK: query: create table src_rc_merge_test_stat(key int, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_rc_merge_test_stat(key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_rc_merge_test_stat PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test_stat PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_stat POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test_stat POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_stat PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test_stat PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_stat POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test_stat POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_stat PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test_stat PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_stat POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test_stat POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_stat PREHOOK: query: show table extended like `src_rc_merge_test_stat` PREHOOK: type: SHOW_TABLESTATUS @@ -97,33 +105,41 @@ value string None #### A masked pattern was here #### PREHOOK: query: create table src_rc_merge_test_part_stat(key int, value string) partitioned by (ds string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_rc_merge_test_part_stat(key int, value string) partitioned by (ds string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_rc_merge_test_part_stat PREHOOK: query: alter table src_rc_merge_test_part_stat add partition (ds='2011') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@src_rc_merge_test_part_stat +PREHOOK: Output: default@src_rc_merge_test_part_stat POSTHOOK: query: alter table src_rc_merge_test_part_stat add partition (ds='2011') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@src_rc_merge_test_part_stat +POSTHOOK: Output: default@src_rc_merge_test_part_stat POSTHOOK: Output: default@src_rc_merge_test_part_stat@ds=2011 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test_part_stat partition (ds='2011') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_part_stat@ds=2011 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test_part_stat partition (ds='2011') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_part_stat@ds=2011 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test_part_stat partition (ds='2011') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_part_stat@ds=2011 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_merge_test_part_stat partition (ds='2011') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_part_stat@ds=2011 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test_part_stat partition (ds='2011') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test_part_stat@ds=2011 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_merge_test_part_stat partition (ds='2011') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test_part_stat@ds=2011 PREHOOK: query: show table extended like `src_rc_merge_test_part_stat` partition (ds='2011') PREHOOK: type: SHOW_TABLESTATUS diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table.q.out b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table.q.out index c21f5e3..583fc54 100644 --- a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table.q.out +++ b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tst1(key string, value string) partitioned by (ds string) clustered by (key) into 10 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst1(key string, value string) partitioned by (ds string) clustered by (key) into 10 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst1 PREHOOK: query: alter table tst1 clustered by (key) into 8 buckets PREHOOK: type: ALTERTABLE_CLUSTER_SORT diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2.q.out b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2.q.out index 83436d7..b79a4d4 100644 --- a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2.q.out +++ b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests that when overwriting a partition in a table after alte CREATE TABLE tst1(key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests that when overwriting a partition in a table after altering the bucketing/sorting metadata -- the partition metadata is updated as well. CREATE TABLE tst1(key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst1 PREHOOK: query: DESCRIBE FORMATTED tst1 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out b/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out index baf06f8..18dd11c 100644 --- a/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out +++ b/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table alter_table_partition_clusterby_sortby (a int, b int) partitioned by (c string) clustered by (a, b) sorted by (a desc, b asc) into 4 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_table_partition_clusterby_sortby (a int, b int) partitioned by (c string) clustered by (a, b) sorted by (a desc, b asc) into 4 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_table_partition_clusterby_sortby PREHOOK: query: alter table alter_table_partition_clusterby_sortby add partition(c='abc') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@alter_table_partition_clusterby_sortby +PREHOOK: Output: default@alter_table_partition_clusterby_sortby POSTHOOK: query: alter table alter_table_partition_clusterby_sortby add partition(c='abc') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@alter_table_partition_clusterby_sortby +POSTHOOK: Output: default@alter_table_partition_clusterby_sortby POSTHOOK: Output: default@alter_table_partition_clusterby_sortby@c=abc PREHOOK: query: -- Turn off sorting for a partition diff --git a/ql/src/test/results/clientpositive/alter_partition_coltype.q.out b/ql/src/test/results/clientpositive/alter_partition_coltype.q.out index 49c1051..30d53cc 100644 --- a/ql/src/test/results/clientpositive/alter_partition_coltype.q.out +++ b/ql/src/test/results/clientpositive/alter_partition_coltype.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- create testing table. create table alter_coltype(key string, value string) partitioned by (dt string, ts string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- create testing table. create table alter_coltype(key string, value string) partitioned by (dt string, ts string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_coltype PREHOOK: query: -- insert and create a partition. insert overwrite table alter_coltype partition(dt='100x', ts='6:30pm') select * from src1 diff --git a/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out b/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out index 0b43385..eab0cd8 100644 --- a/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out +++ b/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table alter_partition_format_test (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_partition_format_test (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_partition_format_test PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE @@ -34,6 +36,7 @@ PREHOOK: Output: default@alter_partition_format_test POSTHOOK: type: ALTERTABLE_LOCATION POSTHOOK: Input: default@alter_partition_format_test POSTHOOK: Output: default@alter_partition_format_test +#### A masked pattern was here #### PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test @@ -53,16 +56,18 @@ POSTHOOK: Output: default@alter_partition_format_test PREHOOK: query: --partitioned table create table alter_partition_format_test (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: --partitioned table create table alter_partition_format_test (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_partition_format_test PREHOOK: query: alter table alter_partition_format_test add partition(ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@alter_partition_format_test +PREHOOK: Output: default@alter_partition_format_test POSTHOOK: query: alter table alter_partition_format_test add partition(ds='2010') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@alter_partition_format_test +POSTHOOK: Output: default@alter_partition_format_test POSTHOOK: Output: default@alter_partition_format_test@ds=2010 PREHOOK: query: desc extended alter_partition_format_test partition(ds='2010') PREHOOK: type: DESCTABLE @@ -109,6 +114,7 @@ POSTHOOK: type: ALTERPARTITION_LOCATION POSTHOOK: Input: default@alter_partition_format_test POSTHOOK: Input: default@alter_partition_format_test@ds=2010 POSTHOOK: Output: default@alter_partition_format_test@ds=2010 +#### A masked pattern was here #### PREHOOK: query: desc extended alter_partition_format_test partition(ds='2010') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010') @@ -166,6 +172,7 @@ PREHOOK: Output: default@alter_partition_format_test POSTHOOK: type: ALTERTABLE_LOCATION POSTHOOK: Input: default@alter_partition_format_test POSTHOOK: Output: default@alter_partition_format_test +#### A masked pattern was here #### PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test diff --git a/ql/src/test/results/clientpositive/alter_partition_protect_mode.q.out b/ql/src/test/results/clientpositive/alter_partition_protect_mode.q.out index fc9a67a..995c1fa 100644 --- a/ql/src/test/results/clientpositive/alter_partition_protect_mode.q.out +++ b/ql/src/test/results/clientpositive/alter_partition_protect_mode.q.out @@ -1,38 +1,48 @@ PREHOOK: query: -- Create table create table if not exists alter_part_protect_mode(key string, value string ) partitioned by (year string, month string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create table create table if not exists alter_part_protect_mode(key string, value string ) partitioned by (year string, month string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_part_protect_mode PREHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_protect_mode partition (year='1996', month='10') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_protect_mode POSTHOOK: query: -- Load data load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_protect_mode partition (year='1996', month='10') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_protect_mode POSTHOOK: Output: default@alter_part_protect_mode@year=1996/month=10 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_protect_mode partition (year='1996', month='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_protect_mode POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_protect_mode partition (year='1996', month='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_protect_mode POSTHOOK: Output: default@alter_part_protect_mode@year=1996/month=12 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_protect_mode partition (year='1995', month='09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_protect_mode POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_protect_mode partition (year='1995', month='09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_protect_mode POSTHOOK: Output: default@alter_part_protect_mode@year=1995/month=09 PREHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_protect_mode partition (year='1994', month='07') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_part_protect_mode POSTHOOK: query: load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_protect_mode partition (year='1994', month='07') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_part_protect_mode POSTHOOK: Output: default@alter_part_protect_mode@year=1994/month=07 PREHOOK: query: -- offline diff --git a/ql/src/test/results/clientpositive/alter_partition_with_whitelist.q.out b/ql/src/test/results/clientpositive/alter_partition_with_whitelist.q.out index 0982dc1..e5b112d 100644 --- a/ql/src/test/results/clientpositive/alter_partition_with_whitelist.q.out +++ b/ql/src/test/results/clientpositive/alter_partition_with_whitelist.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- This pattern matches only letters. CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This pattern matches only letters. CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_whitelist_test PREHOOK: query: SHOW PARTITIONS part_whitelist_test PREHOOK: type: SHOWPARTITIONS @@ -13,10 +15,10 @@ POSTHOOK: query: SHOW PARTITIONS part_whitelist_test POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE part_whitelist_test ADD PARTITION (ds='Part') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@part_whitelist_test +PREHOOK: Output: default@part_whitelist_test POSTHOOK: query: ALTER TABLE part_whitelist_test ADD PARTITION (ds='Part') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@part_whitelist_test +POSTHOOK: Output: default@part_whitelist_test POSTHOOK: Output: default@part_whitelist_test@ds=Part PREHOOK: query: ALTER TABLE part_whitelist_test PARTITION (ds='Part') rename to partition (ds='Apart') PREHOOK: type: ALTERTABLE_RENAMEPART diff --git a/ql/src/test/results/clientpositive/alter_rename_partition.q.out b/ql/src/test/results/clientpositive/alter_rename_partition.q.out index 9808773..239df5a 100644 --- a/ql/src/test/results/clientpositive/alter_rename_partition.q.out +++ b/ql/src/test/results/clientpositive/alter_rename_partition.q.out @@ -23,19 +23,25 @@ srcbucket2 srcpart PREHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_rename_partition_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alter_rename_partition_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alter_rename_partition_src PREHOOK: query: create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_rename_partition PREHOOK: query: insert overwrite table alter_rename_partition partition (pCol1='old_part1:', pcol2='old_part2:') select col1 from alter_rename_partition_src PREHOOK: type: QUERY @@ -161,22 +167,28 @@ POSTHOOK: type: SHOWTABLES POSTHOOK: Lineage: alter_rename_partition PARTITION(pcol1=old_part1:,pcol2=old_part2:).col1 SIMPLE [(alter_rename_partition_src)alter_rename_partition_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: CREATE TABLE alter_rename_partition_src (col1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter_rename_partition_db POSTHOOK: query: CREATE TABLE alter_rename_partition_src (col1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter_rename_partition_db@alter_rename_partition_src +POSTHOOK: Output: database:alter_rename_partition_db POSTHOOK: Lineage: alter_rename_partition PARTITION(pcol1=old_part1:,pcol2=old_part2:).col1 SIMPLE [(alter_rename_partition_src)alter_rename_partition_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/test.dat' OVERWRITE INTO TABLE alter_rename_partition_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: alter_rename_partition_db@alter_rename_partition_src POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/test.dat' OVERWRITE INTO TABLE alter_rename_partition_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: alter_rename_partition_db@alter_rename_partition_src POSTHOOK: Lineage: alter_rename_partition PARTITION(pcol1=old_part1:,pcol2=old_part2:).col1 SIMPLE [(alter_rename_partition_src)alter_rename_partition_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: CREATE TABLE alter_rename_partition (col1 STRING) PARTITIONED BY (pcol1 STRING, pcol2 STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:alter_rename_partition_db POSTHOOK: query: CREATE TABLE alter_rename_partition (col1 STRING) PARTITIONED BY (pcol1 STRING, pcol2 STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: alter_rename_partition_db@alter_rename_partition +POSTHOOK: Output: database:alter_rename_partition_db POSTHOOK: Lineage: alter_rename_partition PARTITION(pcol1=old_part1:,pcol2=old_part2:).col1 SIMPLE [(alter_rename_partition_src)alter_rename_partition_src.FieldSchema(name:col1, type:string, comment:null), ] PREHOOK: query: INSERT OVERWRITE TABLE alter_rename_partition PARTITION (pCol1='old_part1:', pcol2='old_part2:') SELECT col1 FROM alter_rename_partition_src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out b/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out index 8a528a1..4433c13 100644 --- a/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out +++ b/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out @@ -11,8 +11,10 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@src_auth_tmp PREHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_part PREHOOK: query: ALTER TABLE authorization_part SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE") PREHOOK: type: ALTERTABLE_PROPERTIES diff --git a/ql/src/test/results/clientpositive/alter_skewed_table.q.out b/ql/src/test/results/clientpositive/alter_skewed_table.q.out index 10b9c45..70e00f4 100644 --- a/ql/src/test/results/clientpositive/alter_skewed_table.q.out +++ b/ql/src/test/results/clientpositive/alter_skewed_table.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table original (key STRING, value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table original (key STRING, value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@original PREHOOK: query: describe formatted original PREHOOK: type: DESCTABLE @@ -87,8 +89,10 @@ POSTHOOK: Input: default@original POSTHOOK: Output: default@original PREHOOK: query: create table original2 (key STRING, value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table original2 (key STRING, value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@original2 PREHOOK: query: describe formatted original2 PREHOOK: type: DESCTABLE @@ -174,8 +178,10 @@ POSTHOOK: Input: default@original2 POSTHOOK: Output: default@original2 PREHOOK: query: create table original3 (key STRING, value STRING) SKEWED BY (key, value) ON ((1,1),(5,6)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table original3 (key STRING, value STRING) SKEWED BY (key, value) ON ((1,1),(5,6)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@original3 PREHOOK: query: describe formatted original3 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out b/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out index 6f9a993..07fcb32 100644 --- a/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out +++ b/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table alter_table_not_sorted (a int, b int) clustered by (a) sorted by (a) into 4 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_table_not_sorted (a int, b int) clustered by (a) sorted by (a) into 4 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_table_not_sorted PREHOOK: query: desc formatted alter_table_not_sorted PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/alter_table_serde.q.out b/ql/src/test/results/clientpositive/alter_table_serde.q.out index 721229b..2c25f67 100644 --- a/ql/src/test/results/clientpositive/alter_table_serde.q.out +++ b/ql/src/test/results/clientpositive/alter_table_serde.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- test table create table test_table (id int, query string, name string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test table create table test_table (id int, query string, name string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE @@ -59,16 +61,18 @@ POSTHOOK: Output: default@test_table PREHOOK: query: --- test partitioned table create table test_table (id int, query string, name string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: --- test partitioned table create table test_table (id int, query string, name string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: alter table test_table add partition (dt = '2011') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test_table +PREHOOK: Output: default@test_table POSTHOOK: query: alter table test_table add partition (dt = '2011') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test_table +POSTHOOK: Output: default@test_table POSTHOOK: Output: default@test_table@dt=2011 PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/alter_table_serde2.q.out b/ql/src/test/results/clientpositive/alter_table_serde2.q.out index ce1e6ee..347512c 100644 --- a/ql/src/test/results/clientpositive/alter_table_serde2.q.out +++ b/ql/src/test/results/clientpositive/alter_table_serde2.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests that when overwriting a partition in a table after alte CREATE TABLE tst1(key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests that when overwriting a partition in a table after altering the serde properties -- the partition metadata is updated as well. CREATE TABLE tst1(key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst1 PREHOOK: query: DESCRIBE FORMATTED tst1 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/alter_varchar1.q.out b/ql/src/test/results/clientpositive/alter_varchar1.q.out index 6194c3a..2ad5f8e 100644 --- a/ql/src/test/results/clientpositive/alter_varchar1.q.out +++ b/ql/src/test/results/clientpositive/alter_varchar1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table alter_varchar_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table alter_varchar_1 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_varchar_1 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_varchar_1 PREHOOK: query: insert overwrite table alter_varchar_1 select key, value from src order by key limit 5 diff --git a/ql/src/test/results/clientpositive/alter_varchar2.q.out b/ql/src/test/results/clientpositive/alter_varchar2.q.out index c9fb199..3342047 100644 --- a/ql/src/test/results/clientpositive/alter_varchar2.q.out +++ b/ql/src/test/results/clientpositive/alter_varchar2.q.out @@ -8,10 +8,12 @@ PREHOOK: query: create table alter_varchar2 ( c1 varchar(255) ) partitioned by (hr int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alter_varchar2 ( c1 varchar(255) ) partitioned by (hr int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alter_varchar2 PREHOOK: query: insert overwrite table alter_varchar2 partition (hr=1) select value from src tablesample (1 rows) diff --git a/ql/src/test/results/clientpositive/alter_view_rename.q.out b/ql/src/test/results/clientpositive/alter_view_rename.q.out index 1c664f4..0aadc34 100644 --- a/ql/src/test/results/clientpositive/alter_view_rename.q.out +++ b/ql/src/test/results/clientpositive/alter_view_rename.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE invites (foo INT, bar STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE invites (foo INT, bar STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@invites PREHOOK: query: CREATE VIEW view1 as SELECT * FROM invites PREHOOK: type: CREATEVIEW diff --git a/ql/src/test/results/clientpositive/annotate_stats_filter.q.out b/ql/src/test/results/clientpositive/annotate_stats_filter.q.out index e6eae8a..bebf058 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_filter.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_filter.q.out @@ -5,6 +5,7 @@ PREHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -12,11 +13,14 @@ POSTHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_staging PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_orc PREHOOK: query: alter table loc_orc set fileformat orc PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -28,9 +32,11 @@ POSTHOOK: Input: default@loc_orc POSTHOOK: Output: default@loc_orc PREHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@loc_staging POSTHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@loc_staging PREHOOK: query: insert overwrite table loc_orc select * from loc_staging PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out b/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out index e55c35b..13e9cb9 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out @@ -5,6 +5,7 @@ PREHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -12,11 +13,14 @@ POSTHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_staging PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_orc PREHOOK: query: alter table loc_orc set fileformat orc PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -28,9 +32,11 @@ POSTHOOK: Input: default@loc_orc POSTHOOK: Output: default@loc_orc PREHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@loc_staging POSTHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@loc_staging PREHOOK: query: insert overwrite table loc_orc select * from loc_staging PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/annotate_stats_join.q.out b/ql/src/test/results/clientpositive/annotate_stats_join.q.out index 523d386..b7997b1 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_join.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_join.q.out @@ -3,22 +3,26 @@ PREHOOK: query: create table if not exists emp_staging ( deptid int ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists emp_staging ( lastname string, deptid int ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@emp_staging PREHOOK: query: create table if not exists dept_staging ( deptid int, deptname string ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists dept_staging ( deptid int, deptname string ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dept_staging PREHOOK: query: create table if not exists loc_staging ( state string, @@ -27,6 +31,7 @@ PREHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -34,11 +39,14 @@ POSTHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_staging PREHOOK: query: create table if not exists emp_orc like emp_staging PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists emp_orc like emp_staging POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@emp_orc PREHOOK: query: alter table emp_orc set fileformat orc PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -50,8 +58,10 @@ POSTHOOK: Input: default@emp_orc POSTHOOK: Output: default@emp_orc PREHOOK: query: create table if not exists dept_orc like dept_staging PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists dept_orc like dept_staging POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dept_orc PREHOOK: query: alter table dept_orc set fileformat orc PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -63,8 +73,10 @@ POSTHOOK: Input: default@dept_orc POSTHOOK: Output: default@dept_orc PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_orc PREHOOK: query: alter table loc_orc set fileformat orc PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -76,21 +88,27 @@ POSTHOOK: Input: default@loc_orc POSTHOOK: Output: default@loc_orc PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/emp.txt' OVERWRITE INTO TABLE emp_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@emp_staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/emp.txt' OVERWRITE INTO TABLE emp_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@emp_staging PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dept.txt' OVERWRITE INTO TABLE dept_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dept_staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dept.txt' OVERWRITE INTO TABLE dept_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dept_staging PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/loc.txt' OVERWRITE INTO TABLE loc_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@loc_staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/loc.txt' OVERWRITE INTO TABLE loc_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@loc_staging PREHOOK: query: insert overwrite table emp_orc select * from emp_staging PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/annotate_stats_limit.q.out b/ql/src/test/results/clientpositive/annotate_stats_limit.q.out index e6db870..f178878 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_limit.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_limit.q.out @@ -5,6 +5,7 @@ PREHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -12,11 +13,14 @@ POSTHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_staging PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_orc PREHOOK: query: alter table loc_orc set fileformat orc PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -28,9 +32,11 @@ POSTHOOK: Input: default@loc_orc POSTHOOK: Output: default@loc_orc PREHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@loc_staging POSTHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@loc_staging PREHOOK: query: insert overwrite table loc_orc select * from loc_staging PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/annotate_stats_part.q.out b/ql/src/test/results/clientpositive/annotate_stats_part.q.out index 2a56d6e..5578c6c 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_part.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_part.q.out @@ -5,6 +5,7 @@ PREHOOK: query: create table if not exists loc_staging ( year string ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -12,12 +13,15 @@ POSTHOOK: query: create table if not exists loc_staging ( year string ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_staging PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/loc.txt' OVERWRITE INTO TABLE loc_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@loc_staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/loc.txt' OVERWRITE INTO TABLE loc_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@loc_staging PREHOOK: query: create table if not exists loc_orc ( state string, @@ -25,12 +29,14 @@ PREHOOK: query: create table if not exists loc_orc ( zip bigint ) partitioned by(year string) stored as orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists loc_orc ( state string, locid int, zip bigint ) partitioned by(year string) stored as orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_orc PREHOOK: query: -- basicStatState: NONE colStatState: NONE explain extended select * from loc_orc diff --git a/ql/src/test/results/clientpositive/annotate_stats_select.q.out b/ql/src/test/results/clientpositive/annotate_stats_select.q.out index 023b1c3..24b3eb6 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_select.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_select.q.out @@ -18,6 +18,7 @@ PREHOOK: query: create table if not exists alltypes ( collection items terminated by ',' map keys terminated by ':' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists alltypes ( bo1 boolean, ti1 tinyint, @@ -38,11 +39,14 @@ POSTHOOK: query: create table if not exists alltypes ( collection items terminated by ',' map keys terminated by ':' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypes PREHOOK: query: create table alltypes_orc like alltypes PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table alltypes_orc like alltypes POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypes_orc PREHOOK: query: alter table alltypes_orc set fileformat orc PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -54,9 +58,11 @@ POSTHOOK: Input: default@alltypes_orc POSTHOOK: Output: default@alltypes_orc PREHOOK: query: load data local inpath '../../data/files/alltypes.txt' overwrite into table alltypes PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@alltypes POSTHOOK: query: load data local inpath '../../data/files/alltypes.txt' overwrite into table alltypes POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@alltypes PREHOOK: query: insert overwrite table alltypes_orc select * from alltypes PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/annotate_stats_table.q.out b/ql/src/test/results/clientpositive/annotate_stats_table.q.out index 89fa6b1..5555000 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_table.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_table.q.out @@ -3,16 +3,20 @@ PREHOOK: query: create table if not exists emp_staging ( deptid int ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists emp_staging ( lastname string, deptid int ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@emp_staging PREHOOK: query: create table if not exists emp_orc like emp_staging PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists emp_orc like emp_staging POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@emp_orc PREHOOK: query: alter table emp_orc set fileformat orc PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -64,9 +68,11 @@ STAGE PLANS: PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/emp.txt' OVERWRITE INTO TABLE emp_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@emp_staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/emp.txt' OVERWRITE INTO TABLE emp_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@emp_staging PREHOOK: query: insert overwrite table emp_orc select * from emp_staging PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/annotate_stats_union.q.out b/ql/src/test/results/clientpositive/annotate_stats_union.q.out index df1e386..e14c38c 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_union.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_union.q.out @@ -5,6 +5,7 @@ PREHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -12,11 +13,14 @@ POSTHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_staging PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loc_orc PREHOOK: query: alter table loc_orc set fileformat orc PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -28,9 +32,11 @@ POSTHOOK: Input: default@loc_orc POSTHOOK: Output: default@loc_orc PREHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@loc_staging POSTHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@loc_staging PREHOOK: query: insert overwrite table loc_orc select * from loc_staging PREHOOK: type: QUERY @@ -607,6 +613,7 @@ PREHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -614,6 +621,7 @@ POSTHOOK: query: create table if not exists loc_staging ( year int ) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test POSTHOOK: Output: test@loc_staging POSTHOOK: Lineage: loc_orc.locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ] POSTHOOK: Lineage: loc_orc.state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ] @@ -621,8 +629,10 @@ POSTHOOK: Lineage: loc_orc.year SIMPLE [(loc_staging)loc_staging.FieldSchema(nam POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ] PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test POSTHOOK: Output: test@loc_orc POSTHOOK: Lineage: loc_orc.locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ] POSTHOOK: Lineage: loc_orc.state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ] @@ -642,9 +652,11 @@ POSTHOOK: Lineage: loc_orc.year SIMPLE [(loc_staging)loc_staging.FieldSchema(nam POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name:zip, type:bigint, comment:null), ] PREHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: test@loc_staging POSTHOOK: query: load data local inpath '../../data/files/loc.txt' overwrite into table loc_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: test@loc_staging POSTHOOK: Lineage: loc_orc.locid SIMPLE [(loc_staging)loc_staging.FieldSchema(name:locid, type:int, comment:null), ] POSTHOOK: Lineage: loc_orc.state SIMPLE [(loc_staging)loc_staging.FieldSchema(name:state, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out b/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out index ce63c3c..88f64e6 100644 --- a/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out +++ b/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out @@ -12,8 +12,10 @@ POSTHOOK: query: drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src PREHOOK: type: QUERY @@ -27,8 +29,10 @@ POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table tstsrcpart (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 10 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 10 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -277,10 +281,12 @@ PREHOOK: query: CREATE TABLE harbucket(key INT) PARTITIONED by (ds STRING) CLUSTERED BY (key) INTO 10 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE harbucket(key INT) PARTITIONED by (ds STRING) CLUSTERED BY (key) INTO 10 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@harbucket POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -433,9 +439,11 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcp PREHOOK: query: CREATE TABLE old_name(key INT) PARTITIONED by (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE old_name(key INT) PARTITIONED by (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@old_name POSTHOOK: Lineage: harbucket PARTITION(ds=1).key EXPRESSION [(tstsrc)tstsrc.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/archive_multi.q.out b/ql/src/test/results/clientpositive/archive_multi.q.out index 7a5838f..cd7d57b 100644 --- a/ql/src/test/results/clientpositive/archive_multi.q.out +++ b/ql/src/test/results/clientpositive/archive_multi.q.out @@ -8,8 +8,10 @@ POSTHOOK: query: drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src PREHOOK: type: QUERY @@ -23,8 +25,10 @@ POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out b/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out index a219478..2302da0 100644 --- a/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out +++ b/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table src_autho_test (key STRING, value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_autho_test (key STRING, value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_autho_test PREHOOK: query: set role ADMIN PREHOOK: type: SHOW_ROLES diff --git a/ql/src/test/results/clientpositive/authorization_2.q.out b/ql/src/test/results/clientpositive/authorization_2.q.out index e21d5f5..9acb42b 100644 --- a/ql/src/test/results/clientpositive/authorization_2.q.out +++ b/ql/src/test/results/clientpositive/authorization_2.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table authorization_part (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- SORT_BEFORE_DIFF create table authorization_part (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_part PREHOOK: query: create table src_auth_tmp as select * from src PREHOOK: type: CREATETABLE_AS_SELECT @@ -53,14 +55,14 @@ PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part POSTHOOK: type: SHOW_GRANT default authorization_part hive_test_user USER Create false -1 hive_test_user -default authorization_part hive_test_user USER Update false -1 hive_test_user default authorization_part hive_test_user USER Drop false -1 hive_test_user +default authorization_part hive_test_user USER Update false -1 hive_test_user PREHOOK: query: alter table authorization_part add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@authorization_part +PREHOOK: Output: default@authorization_part POSTHOOK: query: alter table authorization_part add partition (ds='2010') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@authorization_part +POSTHOOK: Output: default@authorization_part POSTHOOK: Output: default@authorization_part@ds=2010 PREHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') PREHOOK: type: SHOW_GRANT @@ -225,14 +227,14 @@ POSTHOOK: type: SHOW_GRANT POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] default authorization_part hive_test_user USER Create false -1 hive_test_user -default authorization_part hive_test_user USER Update false -1 hive_test_user default authorization_part hive_test_user USER Drop false -1 hive_test_user +default authorization_part hive_test_user USER Update false -1 hive_test_user PREHOOK: query: alter table authorization_part add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@authorization_part +PREHOOK: Output: default@authorization_part POSTHOOK: query: alter table authorization_part add partition (ds='2010') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@authorization_part +POSTHOOK: Output: default@authorization_part POSTHOOK: Output: default@authorization_part@ds=2010 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] @@ -296,9 +298,9 @@ POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] default authorization_part hive_test_user USER Create false -1 hive_test_user -default authorization_part hive_test_user USER Update false -1 hive_test_user default authorization_part hive_test_user USER Drop false -1 hive_test_user default authorization_part hive_test_user USER Select false -1 hive_test_user +default authorization_part hive_test_user USER Update false -1 hive_test_user PREHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part @@ -352,8 +354,8 @@ POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] default authorization_part hive_test_user USER Create false -1 hive_test_user -default authorization_part hive_test_user USER Update false -1 hive_test_user default authorization_part hive_test_user USER Drop false -1 hive_test_user +default authorization_part hive_test_user USER Update false -1 hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') @@ -447,10 +449,10 @@ POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_au POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: alter table authorization_part add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@authorization_part +PREHOOK: Output: default@authorization_part POSTHOOK: query: alter table authorization_part add partition (ds='2010') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@authorization_part +POSTHOOK: Output: default@authorization_part POSTHOOK: Output: default@authorization_part@ds=2010 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] @@ -677,10 +679,10 @@ POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_au POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: alter table authorization_part add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@authorization_part +PREHOOK: Output: default@authorization_part POSTHOOK: query: alter table authorization_part add partition (ds='2010') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@authorization_part +POSTHOOK: Output: default@authorization_part POSTHOOK: Output: default@authorization_part@ds=2010 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/authorization_6.q.out b/ql/src/test/results/clientpositive/authorization_6.q.out index bb5ed95..41696b1 100644 --- a/ql/src/test/results/clientpositive/authorization_6.q.out +++ b/ql/src/test/results/clientpositive/authorization_6.q.out @@ -11,8 +11,10 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@src_auth_tmp PREHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_part PREHOOK: query: ALTER TABLE authorization_part SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE") PREHOOK: type: ALTERTABLE_PROPERTIES @@ -160,8 +162,10 @@ POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).key EXPRESSION [(src_au POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@authorization_part POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/authorization_7.q.out b/ql/src/test/results/clientpositive/authorization_7.q.out index 240a1cc..c9468be 100644 --- a/ql/src/test/results/clientpositive/authorization_7.q.out +++ b/ql/src/test/results/clientpositive/authorization_7.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: GRANT ALL TO USER hive_test_user POSTHOOK: type: GRANT_PRIVILEGE PREHOOK: query: CREATE TABLE src_authorization_7 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_authorization_7 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_authorization_7 PREHOOK: query: DESCRIBE src_authorization_7 PREHOOK: type: DESCTABLE @@ -31,8 +33,10 @@ POSTHOOK: query: GRANT ALL TO GROUP hive_test_group1 POSTHOOK: type: GRANT_PRIVILEGE PREHOOK: query: CREATE TABLE src_authorization_7 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_authorization_7 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_authorization_7 PREHOOK: query: DESCRIBE src_authorization_7 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/authorization_8.q.out b/ql/src/test/results/clientpositive/authorization_8.q.out index 4eef13b..484f179 100644 --- a/ql/src/test/results/clientpositive/authorization_8.q.out +++ b/ql/src/test/results/clientpositive/authorization_8.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: GRANT ALL TO USER hive_test_user POSTHOOK: type: GRANT_PRIVILEGE PREHOOK: query: CREATE TABLE tbl_j5jbymsx8e (key INT, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl_j5jbymsx8e (key INT, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_j5jbymsx8e PREHOOK: query: CREATE VIEW view_j5jbymsx8e_1 as SELECT * FROM tbl_j5jbymsx8e PREHOOK: type: CREATEVIEW diff --git a/ql/src/test/results/clientpositive/authorization_9.q.out b/ql/src/test/results/clientpositive/authorization_9.q.out index ed6cb08..ad00276 100644 --- a/ql/src/test/results/clientpositive/authorization_9.q.out +++ b/ql/src/test/results/clientpositive/authorization_9.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table dummy (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- SORT_BEFORE_DIFF create table dummy (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dummy PREHOOK: query: grant select on database default to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE diff --git a/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out b/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out index 6fc4897..df0d5c4 100644 --- a/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out +++ b/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- actions from admin should work as if admin has all privileges create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- actions from admin should work as if admin has all privileges create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: show current roles PREHOOK: type: SHOW_ROLES diff --git a/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out b/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out index b1bce1c..08a6eca 100644 --- a/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out +++ b/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table create_table_creator_priv_test(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table create_table_creator_priv_test(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@create_table_creator_priv_test PREHOOK: query: -- all privileges should have been set for user diff --git a/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out b/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out index 1e5c031..9a6ec17 100644 --- a/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out +++ b/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- current user has been set (comment line before the set cmd is CREATE TABLE table_priv1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE table_priv1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_priv1 PREHOOK: query: -- all privileges should have been set for user diff --git a/ql/src/test/results/clientpositive/authorization_owner_actions.q.out b/ql/src/test/results/clientpositive/authorization_owner_actions.q.out index 92b8c62..6ce89e9 100644 --- a/ql/src/test/results/clientpositive/authorization_owner_actions.q.out +++ b/ql/src/test/results/clientpositive/authorization_owner_actions.q.out @@ -1,9 +1,11 @@ #### A masked pattern was here #### create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default #### A masked pattern was here #### create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: ALTER TABLE t1 SET SERDEPROPERTIES ('field.delim' = ',') PREHOOK: type: ALTERTABLE_SERDEPROPERTIES @@ -23,8 +25,10 @@ POSTHOOK: Input: default@t1 POSTHOOK: Output: default@t1 PREHOOK: query: create table t1(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t1(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create view vt1 as select * from t1 PREHOOK: type: CREATEVIEW diff --git a/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out b/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out index ae7e716..c1862c9 100644 --- a/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out +++ b/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- current user has been set (comment line before the set cmd is CREATE TABLE table_priv_rev(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE table_priv_rev(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_priv_rev PREHOOK: query: -- grant insert privilege to user2 GRANT INSERT ON table_priv_rev TO USER user2 diff --git a/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out b/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out index 3bbb015..9a62064 100644 --- a/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out +++ b/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table t1(i int, j int, k int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t1(i int, j int, k int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: -- protecting certain columns create view vt1 as select i,k from t1 diff --git a/ql/src/test/results/clientpositive/auto_join1.q.out b/ql/src/test/results/clientpositive/auto_join1.q.out index 2b98ab9..c967126 100644 --- a/ql/src/test/results/clientpositive/auto_join1.q.out +++ b/ql/src/test/results/clientpositive/auto_join1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: explain FROM src src1 JOIN src src2 ON (src1.key = src2.key) diff --git a/ql/src/test/results/clientpositive/auto_join14_hadoop20.q.out b/ql/src/test/results/clientpositive/auto_join14_hadoop20.q.out index fa05782..c29ebf4 100644 --- a/ql/src/test/results/clientpositive/auto_join14_hadoop20.q.out +++ b/ql/src/test/results/clientpositive/auto_join14_hadoop20.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM src JOIN srcpart ON src.key = srcpart.key AND srcpart.ds = '2008-04-08' and src.key > 100 diff --git a/ql/src/test/results/clientpositive/auto_join17.q.out b/ql/src/test/results/clientpositive/auto_join17.q.out index be18451..d86018e 100644 --- a/ql/src/test/results/clientpositive/auto_join17.q.out +++ b/ql/src/test/results/clientpositive/auto_join17.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM src src1 JOIN src src2 ON (src1.key = src2.key) diff --git a/ql/src/test/results/clientpositive/auto_join19.q.out b/ql/src/test/results/clientpositive/auto_join19.q.out index 4cc74e4..702d2ec 100644 --- a/ql/src/test/results/clientpositive/auto_join19.q.out +++ b/ql/src/test/results/clientpositive/auto_join19.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key) diff --git a/ql/src/test/results/clientpositive/auto_join2.q.out b/ql/src/test/results/clientpositive/auto_join2.q.out index b645396..99d1955 100644 --- a/ql/src/test/results/clientpositive/auto_join2.q.out +++ b/ql/src/test/results/clientpositive/auto_join2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j2 PREHOOK: query: explain FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key + src2.key = src3.key) diff --git a/ql/src/test/results/clientpositive/auto_join24.q.out b/ql/src/test/results/clientpositive/auto_join24.q.out index 4974705..d857045 100644 --- a/ql/src/test/results/clientpositive/auto_join24.q.out +++ b/ql/src/test/results/clientpositive/auto_join24.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tst1(key STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst1(key STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst1 PREHOOK: query: INSERT OVERWRITE TABLE tst1 SELECT a.key, count(1) FROM src a group by a.key diff --git a/ql/src/test/results/clientpositive/auto_join25.q.out b/ql/src/test/results/clientpositive/auto_join25.q.out index 9fe6049..e740f19 100644 --- a/ql/src/test/results/clientpositive/auto_join25.q.out +++ b/ql/src/test/results/clientpositive/auto_join25.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- This test tests the scenario when the mapper dies. So, create a conditional task for the mapjoin CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test tests the scenario when the mapper dies. So, create a conditional task for the mapjoin CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value @@ -54,8 +56,10 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(src)src2.FieldSchema(name:value, type:st 407444119660 PREHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j2 POSTHOOK: Lineage: dest1.key EXPRESSION [(srcpart)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest1.value SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ] @@ -112,8 +116,10 @@ POSTHOOK: Lineage: dest_j2.value SIMPLE [(src)src3.FieldSchema(name:value, type: 33815990627 PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 POSTHOOK: Lineage: dest1.key EXPRESSION [(srcpart)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest1.value SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/auto_join26.q.out b/ql/src/test/results/clientpositive/auto_join26.q.out index 678f9ab..91fa706 100644 --- a/ql/src/test/results/clientpositive/auto_join26.q.out +++ b/ql/src/test/results/clientpositive/auto_join26.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key INT, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE dest_j1 diff --git a/ql/src/test/results/clientpositive/auto_join3.q.out b/ql/src/test/results/clientpositive/auto_join3.q.out index 8c5fc02..567fdae 100644 --- a/ql/src/test/results/clientpositive/auto_join3.q.out +++ b/ql/src/test/results/clientpositive/auto_join3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key = src3.key) diff --git a/ql/src/test/results/clientpositive/auto_join32.q.out b/ql/src/test/results/clientpositive/auto_join32.q.out index 3503fb1..cedb26a 100644 --- a/ql/src/test/results/clientpositive/auto_join32.q.out +++ b/ql/src/test/results/clientpositive/auto_join32.q.out @@ -1,14 +1,18 @@ PREHOOK: query: -- empty tables create table studenttab10k (name string, age int, gpa double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- empty tables create table studenttab10k (name string, age int, gpa double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@studenttab10k PREHOOK: query: create table votertab10k (name string, age int, registration string, contributions float) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table votertab10k (name string, age int, registration string, contributions float) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@votertab10k PREHOOK: query: explain select s.name, count(distinct registration) from studenttab10k s join votertab10k v @@ -111,14 +115,18 @@ POSTHOOK: Input: default@votertab10k PREHOOK: query: -- smb create table studenttab10k_smb (name string, age int, gpa double) clustered by (name) sorted by (name) into 2 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- smb create table studenttab10k_smb (name string, age int, gpa double) clustered by (name) sorted by (name) into 2 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@studenttab10k_smb PREHOOK: query: create table votertab10k_smb (name string, age int, registration string, contributions float) clustered by (name) sorted by (name) into 2 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table votertab10k_smb (name string, age int, registration string, contributions float) clustered by (name) sorted by (name) into 2 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@votertab10k_smb PREHOOK: query: explain select s.name, count(distinct registration) from studenttab10k_smb s join votertab10k_smb v @@ -202,27 +210,35 @@ POSTHOOK: Input: default@votertab10k_smb #### A masked pattern was here #### PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_smb PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@studenttab10k_smb POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_smb POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@studenttab10k_smb PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_smb PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@studenttab10k_smb POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_smb POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@studenttab10k_smb PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_smb PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@votertab10k_smb POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_smb POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@votertab10k_smb PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_smb PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@votertab10k_smb POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_smb POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@votertab10k_smb PREHOOK: query: explain select s.name, count(distinct registration) from studenttab10k_smb s join votertab10k_smb v @@ -307,40 +323,52 @@ POSTHOOK: Input: default@votertab10k_smb PREHOOK: query: -- smb + partitions create table studenttab10k_part (name string, age int, gpa double) partitioned by (p string) clustered by (name) sorted by (name) into 2 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- smb + partitions create table studenttab10k_part (name string, age int, gpa double) partitioned by (p string) clustered by (name) sorted by (name) into 2 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@studenttab10k_part PREHOOK: query: create table votertab10k_part (name string, age int, registration string, contributions float) partitioned by (p string) clustered by (name) sorted by (name) into 2 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table votertab10k_part (name string, age int, registration string, contributions float) partitioned by (p string) clustered by (name) sorted by (name) into 2 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@votertab10k_part PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_part partition (p='foo') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@studenttab10k_part POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_part partition (p='foo') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@studenttab10k_part POSTHOOK: Output: default@studenttab10k_part@p=foo PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_part partition (p='foo') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@studenttab10k_part@p=foo POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_part partition (p='foo') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@studenttab10k_part@p=foo PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_part partition (p='foo') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@votertab10k_part POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_part partition (p='foo') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@votertab10k_part POSTHOOK: Output: default@votertab10k_part@p=foo PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_part partition (p='foo') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@votertab10k_part@p=foo POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_part partition (p='foo') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@votertab10k_part@p=foo PREHOOK: query: explain select s.name, count(distinct registration) from studenttab10k_part s join votertab10k_part v diff --git a/ql/src/test/results/clientpositive/auto_join4.q.out b/ql/src/test/results/clientpositive/auto_join4.q.out index f333727..ad8f733 100644 --- a/ql/src/test/results/clientpositive/auto_join4.q.out +++ b/ql/src/test/results/clientpositive/auto_join4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM ( diff --git a/ql/src/test/results/clientpositive/auto_join5.q.out b/ql/src/test/results/clientpositive/auto_join5.q.out index 963ce09..2399f6b 100644 --- a/ql/src/test/results/clientpositive/auto_join5.q.out +++ b/ql/src/test/results/clientpositive/auto_join5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM ( diff --git a/ql/src/test/results/clientpositive/auto_join6.q.out b/ql/src/test/results/clientpositive/auto_join6.q.out index 9323f08..048f02e 100644 --- a/ql/src/test/results/clientpositive/auto_join6.q.out +++ b/ql/src/test/results/clientpositive/auto_join6.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM ( diff --git a/ql/src/test/results/clientpositive/auto_join7.q.out b/ql/src/test/results/clientpositive/auto_join7.q.out index f9247fa..717688d 100644 --- a/ql/src/test/results/clientpositive/auto_join7.q.out +++ b/ql/src/test/results/clientpositive/auto_join7.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING, c5 INT, c6 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING, c5 INT, c6 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM ( diff --git a/ql/src/test/results/clientpositive/auto_join8.q.out b/ql/src/test/results/clientpositive/auto_join8.q.out index 26b79ec..de916d2 100644 --- a/ql/src/test/results/clientpositive/auto_join8.q.out +++ b/ql/src/test/results/clientpositive/auto_join8.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM ( diff --git a/ql/src/test/results/clientpositive/auto_join9.q.out b/ql/src/test/results/clientpositive/auto_join9.q.out index 7674d29..67de5c1 100644 --- a/ql/src/test/results/clientpositive/auto_join9.q.out +++ b/ql/src/test/results/clientpositive/auto_join9.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key) diff --git a/ql/src/test/results/clientpositive/auto_join_filters.q.out b/ql/src/test/results/clientpositive/auto_join_filters.q.out index 6ad858d..7c13c46 100644 --- a/ql/src/test/results/clientpositive/auto_join_filters.q.out +++ b/ql/src/test/results/clientpositive/auto_join_filters.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE myinput1(key int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE myinput1(key int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@myinput1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in3.txt' INTO TABLE myinput1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@myinput1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in3.txt' INTO TABLE myinput1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@myinput1 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value PREHOOK: type: QUERY @@ -245,37 +249,49 @@ POSTHOOK: Input: default@myinput1 3078400 PREHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_input1 PREHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_input2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input2 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/auto_join_nulls.q.out b/ql/src/test/results/clientpositive/auto_join_nulls.q.out index 4880801..f183075 100644 --- a/ql/src/test/results/clientpositive/auto_join_nulls.q.out +++ b/ql/src/test/results/clientpositive/auto_join_nulls.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE myinput1(key int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE myinput1(key int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@myinput1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' INTO TABLE myinput1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@myinput1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' INTO TABLE myinput1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@myinput1 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a JOIN myinput1 b PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out index 48ca65f..f466188 100644 --- a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out +++ b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out @@ -2,16 +2,20 @@ PREHOOK: query: -- HIVE-5056 RS has expression list for values, but it's ignored create table testsrc ( `key` int,`val` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-5056 RS has expression list for values, but it's ignored in MapJoinProcessor create table testsrc ( `key` int,`val` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@testsrc PREHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table testsrc PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@testsrc POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table testsrc POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@testsrc PREHOOK: query: drop table if exists orderpayment_small PREHOOK: type: DROPTABLE @@ -19,8 +23,10 @@ POSTHOOK: query: drop table if exists orderpayment_small POSTHOOK: type: DROPTABLE PREHOOK: query: create table orderpayment_small (`dealid` int,`date` string,`time` string, `cityid` int, `userid` int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table orderpayment_small (`dealid` int,`date` string,`time` string, `cityid` int, `userid` int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orderpayment_small PREHOOK: query: insert overwrite table orderpayment_small select 748, '2011-03-24', '2011-03-24', 55 ,5372613 from testsrc tablesample (1 rows) PREHOOK: type: QUERY @@ -46,8 +52,10 @@ POSTHOOK: Lineage: orderpayment_small.time SIMPLE [] POSTHOOK: Lineage: orderpayment_small.userid SIMPLE [] PREHOOK: query: create table user_small( userid int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table user_small( userid int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@user_small POSTHOOK: Lineage: orderpayment_small.cityid SIMPLE [] POSTHOOK: Lineage: orderpayment_small.date SIMPLE [] diff --git a/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out b/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out index 2f18bbc..fb19c2b 100644 --- a/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out +++ b/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: insert overwrite table tbl1 select * from src where key < 10 @@ -1420,8 +1424,10 @@ POSTHOOK: Lineage: tbl2.value SIMPLE [(src)src.FieldSchema(name:value, type:stri 20 PREHOOK: query: CREATE TABLE dest1(key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: tbl1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tbl1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -1429,8 +1435,10 @@ POSTHOOK: Lineage: tbl2.key EXPRESSION [(src)src.FieldSchema(name:key, type:stri POSTHOOK: Lineage: tbl2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE dest2(key int, val1 string, val2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest2(key int, val1 string, val2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 POSTHOOK: Lineage: tbl1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tbl1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -1746,8 +1754,10 @@ POSTHOOK: Lineage: tbl2.key EXPRESSION [(src)src.FieldSchema(name:key, type:stri POSTHOOK: Lineage: tbl2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE dest2(key int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest2(key int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 POSTHOOK: Lineage: dest1.key SIMPLE [(tbl1)a.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: dest1.value SIMPLE [(tbl1)a.FieldSchema(name:value, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out index e84e7b2..37be6eb 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out @@ -3,79 +3,103 @@ PREHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: -- Since size is being used to find the big table, the order of the tables in the join does not matter explain extended select count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out index 1f64f8e..8882aac 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: insert overwrite table tbl1 select * from src where key < 10 diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out index 8ac2c06..8235aab 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out @@ -2,78 +2,102 @@ PREHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: explain extended select count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out index d462218..604fa95 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out @@ -3,105 +3,137 @@ PREHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_medium (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_medium (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_medium PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_medium partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_medium POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_medium partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_medium POSTHOOK: Output: default@bucket_medium@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_medium partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_medium@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_medium partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_medium@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_medium partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_medium@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_medium partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_medium@ds=2008-04-08 PREHOOK: query: explain extended select count(*) FROM bucket_small a JOIN bucket_medium b ON a.key = b.key JOIN bucket_big c ON c.key = b.key JOIN bucket_medium d ON c.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out index d0eb39c..b9c497d 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: insert overwrite table tbl1 select * from src where key < 10 PREHOOK: type: QUERY @@ -32,8 +36,10 @@ POSTHOOK: Lineage: tbl2.key EXPRESSION [(src)src.FieldSchema(name:key, type:stri POSTHOOK: Lineage: tbl2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE dest1(k1 int, k2 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(k1 int, k2 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: tbl1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tbl1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -41,8 +47,10 @@ POSTHOOK: Lineage: tbl2.key EXPRESSION [(src)src.FieldSchema(name:key, type:stri POSTHOOK: Lineage: tbl2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE dest2(k1 string, k2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest2(k1 string, k2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 POSTHOOK: Lineage: tbl1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tbl1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out index 917b895..f96462b 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: insert overwrite table tbl1 select * from src where key < 20 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out index 53a9a7f..f06d316 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: insert overwrite table tbl1 select * from src where key < 20 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_16.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_16.q.out index b506ebe..d7ec333 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_16.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_16.q.out @@ -5,6 +5,7 @@ value STRING ) PARTITIONED BY (file_tag STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stage_bucket_big ( key BIGINT, @@ -12,6 +13,7 @@ value STRING ) PARTITIONED BY (file_tag STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stage_bucket_big PREHOOK: query: CREATE TABLE bucket_big ( @@ -22,6 +24,7 @@ PARTITIONED BY (day STRING, pri bigint) clustered by (key) sorted by (key) into 12 buckets stored as RCFile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big ( key BIGINT, @@ -31,6 +34,7 @@ PARTITIONED BY (day STRING, pri bigint) clustered by (key) sorted by (key) into 12 buckets stored as RCFile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: CREATE TABLE stage_bucket_small ( @@ -39,6 +43,7 @@ value string ) PARTITIONED BY (file_tag STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stage_bucket_small ( key BIGINT, @@ -46,6 +51,7 @@ value string ) PARTITIONED BY (file_tag STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stage_bucket_small PREHOOK: query: CREATE TABLE bucket_small ( @@ -56,6 +62,7 @@ PARTITIONED BY (pri bigint) clustered by (key) sorted by (key) into 12 buckets stored as RCFile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_small ( key BIGINT, @@ -65,19 +72,24 @@ PARTITIONED BY (pri bigint) clustered by (key) sorted by (key) into 12 buckets stored as RCFile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' overwrite into table stage_bucket_small partition (file_tag='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@stage_bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' overwrite into table stage_bucket_small partition (file_tag='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@stage_bucket_small POSTHOOK: Output: default@stage_bucket_small@file_tag=1 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' overwrite into table stage_bucket_small partition (file_tag='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@stage_bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' overwrite into table stage_bucket_small partition (file_tag='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@stage_bucket_small POSTHOOK: Output: default@stage_bucket_small@file_tag=2 PREHOOK: query: insert overwrite table bucket_small partition(pri) @@ -113,9 +125,11 @@ POSTHOOK: Lineage: bucket_small PARTITION(pri=2).key SIMPLE [(stage_bucket_small POSTHOOK: Lineage: bucket_small PARTITION(pri=2).value SIMPLE [(stage_bucket_small)stage_bucket_small.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' overwrite into table stage_bucket_big partition (file_tag='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@stage_bucket_big POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' overwrite into table stage_bucket_big partition (file_tag='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@stage_bucket_big POSTHOOK: Output: default@stage_bucket_big@file_tag=1 POSTHOOK: Lineage: bucket_small PARTITION(pri=1).key SIMPLE [(stage_bucket_small)stage_bucket_small.FieldSchema(name:key, type:bigint, comment:null), ] diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out index 0488485..7599ecc 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out @@ -1,65 +1,85 @@ PREHOOK: query: -- small 1 part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 1 part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: -- Since the leftmost table is assumed as the big table, arrange the tables in the join accordingly explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out index 1537f65..122dfa4 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out @@ -1,65 +1,85 @@ PREHOOK: query: -- small 2 part, 2 bucket & big 1 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 2 part, 2 bucket & big 1 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: -- Since size is being used to find the big table, the order of the tables in the join does not matter explain extended select count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out index 6dd49c4..43a9756 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out @@ -1,77 +1,101 @@ PREHOOK: query: -- small 2 part, 4 bucket & big 1 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 2 part, 4 bucket & big 1 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: -- Since size is being used to find the big table, the order of the tables in the join does not matter explain extended select count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out index 0f4f59f..bba55d0 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out @@ -1,50 +1,66 @@ PREHOOK: query: -- small no part, 4 bucket & big no part, 2 bucket CREATE TABLE bucket_small (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small no part, 4 bucket & big no part, 2 bucket CREATE TABLE bucket_small (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: CREATE TABLE bucket_big (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big PREHOOK: query: -- Since size is being used to find the big table, the order of the tables in the join does not matter explain extended select count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out index f137e4e..ea1afbe 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out @@ -1,22 +1,30 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: CREATE TABLE tbl3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl3 PREHOOK: query: CREATE TABLE tbl4(key int, value string) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl4(key int, value string) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl4 PREHOOK: query: insert overwrite table tbl1 select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out index b176c55..254ea75 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out @@ -1,90 +1,118 @@ PREHOOK: query: -- small 2 part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 2 part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: -- Since size is being used to find the big table, the order of the tables in the join does not matter explain extended select count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out index 5d2342c..f37bd9a 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out @@ -1,90 +1,118 @@ PREHOOK: query: -- small 2 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 2 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: -- Since size is being used to find the big table, the order of the tables in the join does not matter explain extended select count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out index 3fc89ba..d612f34 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: insert overwrite table tbl1 select * from src where key < 10 diff --git a/ql/src/test/results/clientpositive/avro_change_schema.q.out b/ql/src/test/results/clientpositive/avro_change_schema.q.out index a98e715..2dd94c7 100644 --- a/ql/src/test/results/clientpositive/avro_change_schema.q.out +++ b/ql/src/test/results/clientpositive/avro_change_schema.q.out @@ -13,6 +13,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ "namespace": "org.apache.hive", { "name":"string2", "type":"string" } ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- verify that we can update the table properties CREATE TABLE avro2 ROW FORMAT @@ -28,6 +29,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ "namespace": "org.apache.hive", { "name":"string2", "type":"string" } ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@avro2 PREHOOK: query: DESCRIBE avro2 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/avro_compression_enabled.q.out b/ql/src/test/results/clientpositive/avro_compression_enabled.q.out index ac7df11..2352640 100644 --- a/ql/src/test/results/clientpositive/avro_compression_enabled.q.out +++ b/ql/src/test/results/clientpositive/avro_compression_enabled.q.out @@ -35,6 +35,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- verify that new joins bring in correct schemas (including evolved schemas) CREATE TABLE doctors4 @@ -72,12 +73,15 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@doctors4 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@doctors4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@doctors4 PREHOOK: query: select count(*) from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out b/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out index a34d863..c3a915a 100644 --- a/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out +++ b/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out @@ -34,6 +34,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- verify that new fields in schema get propagated to table scans CREATE TABLE doctors_with_new_field ROW FORMAT @@ -70,6 +71,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@doctors_with_new_field PREHOOK: query: DESCRIBE doctors_with_new_field PREHOOK: type: DESCTABLE @@ -81,9 +83,11 @@ last_name string from deserializer extra_field string from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors_with_new_field PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@doctors_with_new_field POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors_with_new_field POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@doctors_with_new_field PREHOOK: query: SELECT * FROM doctors_with_new_field ORDER BY first_name PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/avro_joins.q.out b/ql/src/test/results/clientpositive/avro_joins.q.out index 8298902..5dfb97c 100644 --- a/ql/src/test/results/clientpositive/avro_joins.q.out +++ b/ql/src/test/results/clientpositive/avro_joins.q.out @@ -35,6 +35,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- verify that new joins bring in correct schemas (including evolved schemas) CREATE TABLE doctors4 @@ -72,6 +73,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@doctors4 PREHOOK: query: DESCRIBE doctors4 PREHOOK: type: DESCTABLE @@ -83,9 +85,11 @@ last_name string from deserializer extra_field string from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@doctors4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@doctors4 PREHOOK: query: CREATE TABLE episodes ROW FORMAT @@ -116,6 +120,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE episodes ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe' @@ -145,6 +150,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@episodes PREHOOK: query: DESCRIBE episodes PREHOOK: type: DESCTABLE @@ -155,9 +161,11 @@ air_date string from deserializer doctor int from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/episodes.avro' INTO TABLE episodes PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@episodes POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/episodes.avro' INTO TABLE episodes POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@episodes PREHOOK: query: SELECT e.title, e.air_date, d.first_name, d.last_name, d.extra_field, e.air_date FROM doctors4 d JOIN episodes e ON (d.number=e.doctor) diff --git a/ql/src/test/results/clientpositive/avro_nullable_fields.q.out b/ql/src/test/results/clientpositive/avro_nullable_fields.q.out index 81950b0..77a6a2e 100644 --- a/ql/src/test/results/clientpositive/avro_nullable_fields.q.out +++ b/ql/src/test/results/clientpositive/avro_nullable_fields.q.out @@ -17,6 +17,7 @@ CREATE TABLE test_serializer(string1 STRING, ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' COLLECTION ITEMS TERMINATED BY ':' MAP KEYS TERMINATED BY '#' LINES TERMINATED BY '\n' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Verify that nullable fields properly work CREATE TABLE test_serializer(string1 STRING, int1 INT, @@ -36,12 +37,15 @@ CREATE TABLE test_serializer(string1 STRING, ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' COLLECTION ITEMS TERMINATED BY ':' MAP KEYS TERMINATED BY '#' LINES TERMINATED BY '\n' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_serializer PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/csv.txt' INTO TABLE test_serializer PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test_serializer POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/csv.txt' INTO TABLE test_serializer POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test_serializer PREHOOK: query: CREATE TABLE as_avro ROW FORMAT @@ -78,6 +82,7 @@ PREHOOK: query: CREATE TABLE as_avro }' ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE as_avro ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe' @@ -113,6 +118,7 @@ POSTHOOK: query: CREATE TABLE as_avro }' ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@as_avro PREHOOK: query: INSERT OVERWRITE TABLE as_avro SELECT * FROM test_serializer PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/avro_partitioned.q.out b/ql/src/test/results/clientpositive/avro_partitioned.q.out index d53e252..352ec0d 100644 --- a/ql/src/test/results/clientpositive/avro_partitioned.q.out +++ b/ql/src/test/results/clientpositive/avro_partitioned.q.out @@ -28,6 +28,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- verify that new joins bring in correct schemas (including evolved schemas) CREATE TABLE episodes ROW FORMAT @@ -58,12 +59,15 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@episodes PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/episodes.avro' INTO TABLE episodes PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@episodes POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/episodes.avro' INTO TABLE episodes POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@episodes PREHOOK: query: CREATE TABLE episodes_partitioned PARTITIONED BY (doctor_pt INT) @@ -95,6 +99,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE episodes_partitioned PARTITIONED BY (doctor_pt INT) ROW FORMAT @@ -125,6 +130,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@episodes_partitioned PREHOOK: query: INSERT OVERWRITE TABLE episodes_partitioned PARTITION (doctor_pt) SELECT title, air_date, doctor, doctor as doctor_pt FROM episodes PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/avro_sanity_test.q.out b/ql/src/test/results/clientpositive/avro_sanity_test.q.out index c6af33b..2add6e8 100644 --- a/ql/src/test/results/clientpositive/avro_sanity_test.q.out +++ b/ql/src/test/results/clientpositive/avro_sanity_test.q.out @@ -28,6 +28,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- verify that we can actually read avro files CREATE TABLE doctors ROW FORMAT @@ -58,6 +59,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@doctors PREHOOK: query: DESCRIBE doctors PREHOOK: type: DESCTABLE @@ -68,9 +70,11 @@ first_name string from deserializer last_name string from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@doctors POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@doctors PREHOOK: query: SELECT * FROM doctors ORDER BY number PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/avro_schema_error_message.q.out b/ql/src/test/results/clientpositive/avro_schema_error_message.q.out index 1e473f1..76bdc71 100644 --- a/ql/src/test/results/clientpositive/avro_schema_error_message.q.out +++ b/ql/src/test/results/clientpositive/avro_schema_error_message.q.out @@ -7,6 +7,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- verify we get the sentinel schema if we don't provide one CREATE TABLE avro_with_no_schema @@ -16,6 +17,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@avro_with_no_schema PREHOOK: query: DESCRIBE avro_with_no_schema PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/avro_schema_literal.q.out b/ql/src/test/results/clientpositive/avro_schema_literal.q.out index d53c1de..fcf3410 100644 --- a/ql/src/test/results/clientpositive/avro_schema_literal.q.out +++ b/ql/src/test/results/clientpositive/avro_schema_literal.q.out @@ -28,6 +28,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ { "name":"fixed1", "type":{"type":"fixed", "name":"threebytes", "size":3} } ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE avro1 ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe' @@ -58,6 +59,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ { "name":"fixed1", "type":{"type":"fixed", "name":"threebytes", "size":3} } ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@avro1 PREHOOK: query: DESCRIBE avro1 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/ba_table1.q.out b/ql/src/test/results/clientpositive/ba_table1.q.out index 89742cc..0877dd9 100644 --- a/ql/src/test/results/clientpositive/ba_table1.q.out +++ b/ql/src/test/results/clientpositive/ba_table1.q.out @@ -6,10 +6,12 @@ PREHOOK: query: -- This query tests a) binary type works correctly in grammar b) create table ba_test (ba_key binary, ba_val binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This query tests a) binary type works correctly in grammar b) string can be cast into binary c) binary can be stored in a table d) binary data can be loaded back again and queried d) order-by on a binary key create table ba_test (ba_key binary, ba_val binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ba_test PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/ba_table2.q.out b/ql/src/test/results/clientpositive/ba_table2.q.out index ddf2bce..4174287 100644 --- a/ql/src/test/results/clientpositive/ba_table2.q.out +++ b/ql/src/test/results/clientpositive/ba_table2.q.out @@ -6,10 +6,12 @@ PREHOOK: query: -- All the test in ba_test1.q + using LazyBinarySerde instead of create table ba_test (ba_key binary, ba_val binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- All the test in ba_test1.q + using LazyBinarySerde instead of LazySimpleSerde create table ba_test (ba_key binary, ba_val binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ba_test PREHOOK: query: alter table ba_test set serde 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/ba_table3.q.out b/ql/src/test/results/clientpositive/ba_table3.q.out index eaa8051..339714f 100644 --- a/ql/src/test/results/clientpositive/ba_table3.q.out +++ b/ql/src/test/results/clientpositive/ba_table3.q.out @@ -6,10 +6,12 @@ PREHOOK: query: -- All the tests of ba_table1.q + test for a group-by and aggreg create table ba_test (ba_key binary, ba_val binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- All the tests of ba_table1.q + test for a group-by and aggregation on a binary key. create table ba_test (ba_key binary, ba_val binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ba_test PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/ba_table_udfs.q.out b/ql/src/test/results/clientpositive/ba_table_udfs.q.out index e17d388..17fd36a 100644 --- a/ql/src/test/results/clientpositive/ba_table_udfs.q.out +++ b/ql/src/test/results/clientpositive/ba_table_udfs.q.out @@ -6,10 +6,12 @@ PREHOOK: query: CREATE TABLE dest1(bytes1 BINARY, bytes2 BINARY, string STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(bytes1 BINARY, bytes2 BINARY, string STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT diff --git a/ql/src/test/results/clientpositive/ba_table_union.q.out b/ql/src/test/results/clientpositive/ba_table_union.q.out index ed97274..8846a01 100644 --- a/ql/src/test/results/clientpositive/ba_table_union.q.out +++ b/ql/src/test/results/clientpositive/ba_table_union.q.out @@ -5,9 +5,11 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: -- this query tests ba_table1.q + nested queries with multiple operations on binary data types + union on binary types create table ba_test (ba_key binary, ba_val binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- this query tests ba_table1.q + nested queries with multiple operations on binary data types + union on binary types create table ba_test (ba_key binary, ba_val binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ba_test PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/binary_output_format.q.out b/ql/src/test/results/clientpositive/binary_output_format.q.out index bcfb8eb..82c8424 100644 --- a/ql/src/test/results/clientpositive/binary_output_format.q.out +++ b/ql/src/test/results/clientpositive/binary_output_format.q.out @@ -9,6 +9,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveBinaryOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create a table with binary output format CREATE TABLE dest1(mydata STRING) ROW FORMAT SERDE @@ -20,6 +21,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveBinaryOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: -- Insert into that table using transform EXPLAIN EXTENDED diff --git a/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out b/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out index fbe148f..bb3c296 100644 --- a/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out +++ b/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out @@ -6,10 +6,12 @@ PREHOOK: query: -- Tests everything in binary_table_colserde.q + uses LazyBinary create table ba_test (ba_key binary, ba_val binary) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests everything in binary_table_colserde.q + uses LazyBinaryColumnarSerde create table ba_test (ba_key binary, ba_val binary) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ba_test PREHOOK: query: alter table ba_test set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/binary_table_colserde.q.out b/ql/src/test/results/clientpositive/binary_table_colserde.q.out index aa8be39..a8b195f 100644 --- a/ql/src/test/results/clientpositive/binary_table_colserde.q.out +++ b/ql/src/test/results/clientpositive/binary_table_colserde.q.out @@ -6,10 +6,12 @@ PREHOOK: query: -- Everything in ba_table1.q + columnar serde in RCFILE. create table ba_test (ba_key binary, ba_val binary) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Everything in ba_table1.q + columnar serde in RCFILE. create table ba_test (ba_key binary, ba_val binary) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ba_test PREHOOK: query: alter table ba_test set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/binarysortable_1.q.out b/ql/src/test/results/clientpositive/binarysortable_1.q.out index 1fa8dd4..4d17faf 100644 --- a/ql/src/test/results/clientpositive/binarysortable_1.q.out +++ b/ql/src/test/results/clientpositive/binarysortable_1.q.out @@ -3,17 +3,21 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY '9' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE mytable(key STRING, value STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '9' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mytable PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/string.txt' INTO TABLE mytable PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@mytable POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/string.txt' INTO TABLE mytable POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@mytable PREHOOK: query: EXPLAIN SELECT REGEXP_REPLACE(REGEXP_REPLACE(REGEXP_REPLACE(key, '\001', '^A'), '\0', '^@'), '\002', '^B'), value diff --git a/ql/src/test/results/clientpositive/bucket1.q.out b/ql/src/test/results/clientpositive/bucket1.q.out index 5ade5f8..6d3af5c 100644 --- a/ql/src/test/results/clientpositive/bucket1.q.out +++ b/ql/src/test/results/clientpositive/bucket1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE bucket1_1(key int, value string) CLUSTERED BY (key) INTO 100 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket1_1(key int, value string) CLUSTERED BY (key) INTO 100 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket1_1 PREHOOK: query: explain extended insert overwrite table bucket1_1 diff --git a/ql/src/test/results/clientpositive/bucket2.q.out b/ql/src/test/results/clientpositive/bucket2.q.out index 672903d..1e6921a 100644 --- a/ql/src/test/results/clientpositive/bucket2.q.out +++ b/ql/src/test/results/clientpositive/bucket2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE bucket2_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket2_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket2_1 PREHOOK: query: explain extended insert overwrite table bucket2_1 diff --git a/ql/src/test/results/clientpositive/bucket3.q.out b/ql/src/test/results/clientpositive/bucket3.q.out index 9232f6b..90a7cc3 100644 --- a/ql/src/test/results/clientpositive/bucket3.q.out +++ b/ql/src/test/results/clientpositive/bucket3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE bucket3_1(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket3_1(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket3_1 PREHOOK: query: explain extended insert overwrite table bucket3_1 partition (ds='1') diff --git a/ql/src/test/results/clientpositive/bucket4.q.out b/ql/src/test/results/clientpositive/bucket4.q.out index fb2f619..3f21a5a 100644 --- a/ql/src/test/results/clientpositive/bucket4.q.out +++ b/ql/src/test/results/clientpositive/bucket4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket4_1 PREHOOK: query: explain extended insert overwrite table bucket4_1 diff --git a/ql/src/test/results/clientpositive/bucket5.q.out b/ql/src/test/results/clientpositive/bucket5.q.out index 8a49352..c2fc368 100644 --- a/ql/src/test/results/clientpositive/bucket5.q.out +++ b/ql/src/test/results/clientpositive/bucket5.q.out @@ -3,16 +3,20 @@ PREHOOK: query: -- Tests that when a multi insert inserts into a bucketed table CREATE TABLE bucketed_table(key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests that when a multi insert inserts into a bucketed table and a table which is not bucketed -- the bucketed table is not merged and the table which is not bucketed is CREATE TABLE bucketed_table(key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketed_table PREHOOK: query: CREATE TABLE unbucketed_table(key INT, value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE unbucketed_table(key INT, value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@unbucketed_table PREHOOK: query: EXPLAIN EXTENDED FROM src diff --git a/ql/src/test/results/clientpositive/bucket_groupby.q.out b/ql/src/test/results/clientpositive/bucket_groupby.q.out index 2371bad..10dcb6e 100644 --- a/ql/src/test/results/clientpositive/bucket_groupby.q.out +++ b/ql/src/test/results/clientpositive/bucket_groupby.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@clustergroupby PREHOOK: query: describe extended clustergroupby PREHOOK: type: DESCTABLE @@ -1036,8 +1038,10 @@ POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@clustergroupby POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -1382,8 +1386,10 @@ POSTHOOK: Lineage: clustergroupby PARTITION(ds=102).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: clustergroupby PARTITION(ds=102).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@clustergroupby POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out index 75bcda8..324f140 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out @@ -9,28 +9,36 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table table1(key string, value string) clustered by (key, value) sorted by (key, value) into 1 BUCKETS stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table1(key string, value string) clustered by (key, value) sorted by (key, value) into 1 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: create table table2(key string, value string) clustered by (value, key) sorted by (value, key) into 1 BUCKETS stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table2(key string, value string) clustered by (value, key) sorted by (value, key) into 1 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table1 POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table1 PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table2 POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table2 PREHOOK: query: -- The tables are bucketed in same columns in different order, -- but sorted in different column orders diff --git a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out index a737f82..aef00d2 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out @@ -9,28 +9,36 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table table1(key string, value string) clustered by (key, value) sorted by (key desc, value desc) into 1 BUCKETS stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table1(key string, value string) clustered by (key, value) sorted by (key desc, value desc) into 1 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: create table table2(key string, value string) clustered by (value, key) sorted by (value desc, key desc) into 1 BUCKETS stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table2(key string, value string) clustered by (value, key) sorted by (value desc, key desc) into 1 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table1 POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table1 PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table2 POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table2 PREHOOK: query: -- The tables are bucketed in same columns in different order, -- but sorted in different column orders diff --git a/ql/src/test/results/clientpositive/bucket_num_reducers.q.out b/ql/src/test/results/clientpositive/bucket_num_reducers.q.out index bdf2187..833b18a 100644 --- a/ql/src/test/results/clientpositive/bucket_num_reducers.q.out +++ b/ql/src/test/results/clientpositive/bucket_num_reducers.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- This test sets number of mapred tasks to 10 for a database wi CREATE TABLE bucket_nr(key int, value string) CLUSTERED BY (key) INTO 50 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test sets number of mapred tasks to 10 for a database with 50 buckets, -- and uses a post-hook to confirm that 10 tasks were created CREATE TABLE bucket_nr(key int, value string) CLUSTERED BY (key) INTO 50 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_nr PREHOOK: query: insert overwrite table bucket_nr select * from src diff --git a/ql/src/test/results/clientpositive/bucket_num_reducers2.q.out b/ql/src/test/results/clientpositive/bucket_num_reducers2.q.out index 95d303f..d1c499f 100644 --- a/ql/src/test/results/clientpositive/bucket_num_reducers2.q.out +++ b/ql/src/test/results/clientpositive/bucket_num_reducers2.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- This test sets the maximum number of reduce tasks to 2 for ov CREATE TABLE test_table(key int, value string) CLUSTERED BY (key) INTO 3 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test sets the maximum number of reduce tasks to 2 for overwriting a -- table with 3 buckets, and uses a post-hook to confirm that 1 reducer was used CREATE TABLE test_table(key int, value string) CLUSTERED BY (key) INTO 3 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: insert overwrite table test_table select * from src diff --git a/ql/src/test/results/clientpositive/bucketcontext_1.q.out b/ql/src/test/results/clientpositive/bucketcontext_1.q.out index 930be79..6984239 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out @@ -1,77 +1,101 @@ PREHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: explain extended select /* + MAPJOIN(a) */ count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/bucketcontext_2.q.out b/ql/src/test/results/clientpositive/bucketcontext_2.q.out index 88f747a..15d6db4 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out @@ -1,65 +1,85 @@ PREHOOK: query: -- small 1 part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 1 part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: explain extended select /* + MAPJOIN(a) */ count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/bucketcontext_3.q.out b/ql/src/test/results/clientpositive/bucketcontext_3.q.out index 3da1cc9..558487e 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out @@ -1,65 +1,85 @@ PREHOOK: query: -- small 2 part, 2 bucket & big 1 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 2 part, 2 bucket & big 1 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: explain extended select /* + MAPJOIN(a) */ count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out b/ql/src/test/results/clientpositive/bucketcontext_4.q.out index 33dee62..fbb2421 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out @@ -1,77 +1,101 @@ PREHOOK: query: -- small 2 part, 4 bucket & big 1 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 2 part, 4 bucket & big 1 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: explain extended select /* + MAPJOIN(a) */ count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out b/ql/src/test/results/clientpositive/bucketcontext_5.q.out index eb751f3..46a8c07 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out @@ -1,50 +1,66 @@ PREHOOK: query: -- small no part, 4 bucket & big no part, 2 bucket CREATE TABLE bucket_small (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small no part, 4 bucket & big no part, 2 bucket CREATE TABLE bucket_small (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: CREATE TABLE bucket_big (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big PREHOOK: query: explain extended select /* + MAPJOIN(a) */ count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out b/ql/src/test/results/clientpositive/bucketcontext_6.q.out index 320b8b9..2a4a5a6 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out @@ -1,64 +1,84 @@ PREHOOK: query: -- small no part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small no part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: explain extended select /* + MAPJOIN(a) */ count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out b/ql/src/test/results/clientpositive/bucketcontext_7.q.out index ef4f295..66df6d3 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out @@ -1,90 +1,118 @@ PREHOOK: query: -- small 2 part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 2 part, 4 bucket & big 2 part, 2 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: explain extended select /* + MAPJOIN(a) */ count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/bucketcontext_8.q.out b/ql/src/test/results/clientpositive/bucketcontext_8.q.out index f9e6835..382ac85 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out @@ -1,90 +1,118 @@ PREHOOK: query: -- small 2 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- small 2 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: explain extended select /* + MAPJOIN(a) */ count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/bucketizedhiveinputformat.q.out b/ql/src/test/results/clientpositive/bucketizedhiveinputformat.q.out index e734864..d14347e 100644 --- a/ql/src/test/results/clientpositive/bucketizedhiveinputformat.q.out +++ b/ql/src/test/results/clientpositive/bucketizedhiveinputformat.q.out @@ -1,18 +1,24 @@ PREHOOK: query: CREATE TABLE T1(name STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(name STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(name STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(name STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE T2 SELECT * FROM ( SELECT tmp1.name as name FROM ( @@ -216,22 +222,28 @@ POSTHOOK: Lineage: t2.name SIMPLE [(t1)t1.FieldSchema(name:name, type:string, co 5000000 PREHOOK: query: CREATE TABLE T3(name STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(name STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 POSTHOOK: Lineage: t2.name SIMPLE [(t1)t1.FieldSchema(name:name, type:string, comment:null), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 POSTHOOK: Lineage: t2.name SIMPLE [(t1)t1.FieldSchema(name:name, type:string, comment:null), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv2.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv2.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 POSTHOOK: Lineage: t2.name SIMPLE [(t1)t1.FieldSchema(name:name, type:string, comment:null), ] PREHOOK: query: EXPLAIN SELECT COUNT(1) FROM T3 diff --git a/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out b/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out index 557cd1a..64b5f9f 100644 --- a/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out +++ b/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out @@ -1,75 +1,99 @@ PREHOOK: query: CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_small@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket_big@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket_big partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket_big@ds=2008-04-09 PREHOOK: query: select /* + MAPJOIN(a) */ count(*) FROM bucket_small a JOIN bucket_big b ON a.key = b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/bucketmapjoin1.q.out index 81ca8a7..da8f9c2 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin1.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin1.q.out @@ -1,17 +1,23 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: -- empty partitions (HIVE-3205) explain extended @@ -251,68 +257,90 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part_2 #### A masked pattern was here #### PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_1 PREHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_2 PREHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_tmp_result PREHOOK: query: explain extended insert overwrite table bucketmapjoin_tmp_result diff --git a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out index 60c66ea..4c3eb23 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out @@ -1,22 +1,28 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_1 CLUSTERED BY (key) INTO 3 BUCKETS PREHOOK: type: ALTERTABLE_CLUSTER_SORT @@ -28,48 +34,62 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_2 CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: ALTERTABLE_CLUSTER_SORT @@ -81,16 +101,20 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=2 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_2 CLUSTERED BY (key) INTO 3 BUCKETS PREHOOK: type: ALTERTABLE_CLUSTER_SORT diff --git a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out index 2cc2bd4..1b23104 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out @@ -1,22 +1,28 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_1 CLUSTERED BY (key) INTO 4 BUCKETS PREHOOK: type: ALTERTABLE_CLUSTER_SORT @@ -28,60 +34,78 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=2 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_2 CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: ALTERTABLE_CLUSTER_SORT @@ -93,16 +117,20 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=2 PREHOOK: query: -- The table and partition bucketing metadata doesn't match but the bucket numbers of all partitions is -- a power of 2 and the bucketing columns match so bucket map join should be used diff --git a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out index 2da135e..a79da1a 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out @@ -1,42 +1,54 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_2 NOT CLUSTERED PREHOOK: type: ALTERTABLE_CLUSTER_SORT @@ -49,22 +61,28 @@ POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_3 (key INT, value STRING) PARTITIONED BY (part STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_3 (key INT, value STRING) PARTITIONED BY (part STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_3 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_3 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_3 POSTHOOK: Output: default@srcbucket_mapjoin_part_3@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_3 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_3@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_3 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_3@part=1 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_3 CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: ALTERTABLE_CLUSTER_SORT diff --git a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out index e6af5a9..223a467 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out @@ -1,9 +1,11 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: -- part=1 partition for srcbucket_mapjoin_part_1 is bucketed by 'value' INSERT OVERWRITE TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') @@ -48,9 +50,11 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=2).value SIMPLE [(src PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/bucketmapjoin2.q.out b/ql/src/test/results/clientpositive/bucketmapjoin2.q.out index 7d6dd86..bc606b7 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin2.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin2.q.out @@ -1,65 +1,87 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_1 PREHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_2 PREHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_tmp_result PREHOOK: query: explain extended insert overwrite table bucketmapjoin_tmp_result @@ -1316,10 +1338,12 @@ POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_pa PREHOOK: query: -- HIVE-3210 load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: -- HIVE-3210 load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-09 POSTHOOK: Lineage: bucketmapjoin_hash_result_1.key EXPRESSION [(bucketmapjoin_tmp_result)bucketmapjoin_tmp_result.FieldSchema(name:key, type:string, comment:null), ] @@ -1348,9 +1372,11 @@ POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_pa POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part_2)b.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-09 POSTHOOK: Lineage: bucketmapjoin_hash_result_1.key EXPRESSION [(bucketmapjoin_tmp_result)bucketmapjoin_tmp_result.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: bucketmapjoin_hash_result_1.key EXPRESSION [(bucketmapjoin_tmp_result)bucketmapjoin_tmp_result.FieldSchema(name:key, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/bucketmapjoin3.q.out b/ql/src/test/results/clientpositive/bucketmapjoin3.q.out index f62ce1d..2f7a0fc 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin3.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin3.q.out @@ -1,82 +1,110 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_1 PREHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_2 PREHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_tmp_result PREHOOK: query: explain extended insert overwrite table bucketmapjoin_tmp_result diff --git a/ql/src/test/results/clientpositive/bucketmapjoin4.q.out b/ql/src/test/results/clientpositive/bucketmapjoin4.q.out index ef980f5..176ff6e 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin4.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin4.q.out @@ -1,82 +1,110 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_1 PREHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_2 PREHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_tmp_result PREHOOK: query: explain extended insert overwrite table bucketmapjoin_tmp_result diff --git a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out index d725c7d..981e793 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out @@ -1,120 +1,160 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-09 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-09 PREHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_1 PREHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_2 PREHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_tmp_result PREHOOK: query: explain extended insert overwrite table bucketmapjoin_tmp_result diff --git a/ql/src/test/results/clientpositive/bucketmapjoin6.q.out b/ql/src/test/results/clientpositive/bucketmapjoin6.q.out index 3a96724..731a997 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin6.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin6.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table tmp1 (a string, b string) clustered by (a) sorted by (a) into 10 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp1 (a string, b string) clustered by (a) sorted by (a) into 10 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp1 PREHOOK: query: create table tmp2 (a string, b string) clustered by (a) sorted by (a) into 10 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp2 (a string, b string) clustered by (a) sorted by (a) into 10 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp2 PREHOOK: query: insert overwrite table tmp1 select * from src where key < 50 PREHOOK: type: QUERY @@ -32,8 +36,10 @@ POSTHOOK: Lineage: tmp2.a SIMPLE [(src)src.FieldSchema(name:key, type:string, co POSTHOOK: Lineage: tmp2.b SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table tmp3 (a string, b string, c string) clustered by (a) sorted by (a) into 10 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp3 (a string, b string, c string) clustered by (a) sorted by (a) into 10 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp3 POSTHOOK: Lineage: tmp1.a SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tmp1.b SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/bucketmapjoin7.q.out b/ql/src/test/results/clientpositive/bucketmapjoin7.q.out index 1665a41..dfa1fb2 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin7.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin7.q.out @@ -1,42 +1,54 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (ds STRING, hr STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (ds STRING, hr STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (ds='2008-04-08', hr='0') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (ds='2008-04-08', hr='0') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1@ds=2008-04-08/hr=0 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (ds='2008-04-08', hr='0') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@ds=2008-04-08/hr=0 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (ds='2008-04-08', hr='0') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@ds=2008-04-08/hr=0 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (ds STRING, hr STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (ds STRING, hr STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (ds='2008-04-08', hr='0') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (ds='2008-04-08', hr='0') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08/hr=0 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (ds='2008-04-08', hr='0') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08/hr=0 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (ds='2008-04-08', hr='0') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08/hr=0 PREHOOK: query: -- Tests that bucket map join works with a table with more than one level of partitioning diff --git a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out index 79d4b8e..28118bf 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out @@ -1,42 +1,54 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_2 CLUSTERED BY (key) INTO 3 BUCKETS PREHOOK: type: ALTERTABLE_CLUSTER_SORT diff --git a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out index fd4f9f9..9db85f8 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out @@ -1,48 +1,62 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1 POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_1@part=1 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_2 CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: ALTERTABLE_CLUSTER_SORT @@ -328,16 +342,20 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part_2 PARTITION (part='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@part=1 PREHOOK: query: ALTER TABLE srcbucket_mapjoin_part_2 CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: ALTERTABLE_CLUSTER_SORT diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out index cfff344..9a2cc30 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out @@ -1,48 +1,64 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_tmp_result PREHOOK: query: explain extended insert overwrite table bucketmapjoin_tmp_result diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out index db9ee36..f346ccc 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out @@ -1,55 +1,73 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-09 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-09 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-09 PREHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_tmp_result PREHOOK: query: explain extended insert overwrite table bucketmapjoin_tmp_result diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out index b457bc4..f229460 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out @@ -16,95 +16,127 @@ POSTHOOK: query: drop table test4 POSTHOOK: type: DROPTABLE PREHOOK: query: create table test1 (key string, value string) clustered by (key) sorted by (key) into 3 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test1 (key string, value string) clustered by (key) sorted by (key) into 3 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test1 PREHOOK: query: create table test2 (key string, value string) clustered by (value) sorted by (value) into 3 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test2 (key string, value string) clustered by (value) sorted by (value) into 3 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test2 PREHOOK: query: create table test3 (key string, value string) clustered by (key, value) sorted by (key, value) into 3 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test3 (key string, value string) clustered by (key, value) sorted by (key, value) into 3 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test3 PREHOOK: query: create table test4 (key string, value string) clustered by (value, key) sorted by (value, key) into 3 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test4 (key string, value string) clustered by (value, key) sorted by (value, key) into 3 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test4 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE test1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test1 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE test1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test1 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE test1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test1 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE test1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test1 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE test1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test1 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE test1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test1 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE test2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE test2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test2 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE test2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE test2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test2 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE test2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE test2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test2 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE test3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test3 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE test3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test3 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE test3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test3 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE test3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test3 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE test3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test3 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE test3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test3 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE test4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test4 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE test4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test4 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE test4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test4 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE test4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test4 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE test4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test4 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE test4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test4 PREHOOK: query: -- should be allowed explain extended select /* + MAPJOIN(R) */ * from test1 L join test1 R on L.key=R.key AND L.value=R.value diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out index 1aea8c1..e89d8c2 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out @@ -2,17 +2,21 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out index 415fbd9..7f3ce21 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out @@ -2,24 +2,30 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * where key < 10 diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out index 0b79985..e8baa9b 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out @@ -2,17 +2,21 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (value STRING, key INT) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (value STRING, key INT) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * @@ -150,9 +154,11 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value SIMPLE [(test_table1)a.Fiel PREHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out index 6e0e3be..b4c06a2 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out @@ -2,24 +2,30 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: CREATE TABLE test_table3 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key2) SORTED BY (key2) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key2) SORTED BY (key2) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * where key < 10 @@ -216,9 +222,11 @@ POSTHOOK: Lineage: test_table3 PARTITION(ds=1).value EXPRESSION [(test_table1)a. PREHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out index 0a34f9d..8efab79 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out @@ -2,24 +2,30 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key desc) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key desc) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * where key < 10 diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out index 2fda040..61e3f7c 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out @@ -2,24 +2,30 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key ASC, key2 DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key ASC, key2 DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key ASC, key2 DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key ASC, key2 DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: CREATE TABLE test_table3 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key ASC, key2 DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key ASC, key2 DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT key, key+1, value where key < 10 @@ -1177,9 +1183,11 @@ POSTHOOK: Lineage: test_table3 PARTITION(ds=1).value EXPRESSION [(test_table1)a. PREHOOK: query: CREATE TABLE test_table4 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key DESC, key2 DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table4 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key DESC, key2 DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table4 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key2 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out index 0b0b79f..faf30a2 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out @@ -2,24 +2,30 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * where key < 10 diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out index 4401ddc..5c37b73 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out @@ -2,24 +2,30 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: CREATE TABLE test_table3 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * where key < 10 diff --git a/ql/src/test/results/clientpositive/case_sensitivity.q.out b/ql/src/test/results/clientpositive/case_sensitivity.q.out index 5c66431..2e0cde8 100644 --- a/ql/src/test/results/clientpositive/case_sensitivity.q.out +++ b/ql/src/test/results/clientpositive/case_sensitivity.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE DEST1(Key INT, VALUE STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(Key INT, VALUE STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: EXPLAIN FROM SRC_THRIFT diff --git a/ql/src/test/results/clientpositive/cast1.q.out b/ql/src/test/results/clientpositive/cast1.q.out index 3683de2..d67df9b 100644 --- a/ql/src/test/results/clientpositive/cast1.q.out +++ b/ql/src/test/results/clientpositive/cast1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 INT, c6 STRING, c7 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 INT, c6 STRING, c7 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT 3 + 2, 3.0 + 2, 3 + 2.0, 3.0 + 2.0, 3 + CAST(2.0 AS INT) + CAST(CAST(0 AS SMALLINT) AS INT), CAST(1 AS BOOLEAN), CAST(TRUE AS INT) WHERE src.key = 86 diff --git a/ql/src/test/results/clientpositive/char_1.q.out b/ql/src/test/results/clientpositive/char_1.q.out index 6dfe059..6981143 100644 --- a/ql/src/test/results/clientpositive/char_1.q.out +++ b/ql/src/test/results/clientpositive/char_1.q.out @@ -8,21 +8,27 @@ POSTHOOK: query: drop table char1_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table char1 (key char(10), value char(20)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char1 (key char(10), value char(20)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char1 PREHOOK: query: create table char1_1 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char1_1 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char1_1 PREHOOK: query: -- load from file load data local inpath '../../data/files/srcbucket0.txt' overwrite into table char1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@char1 POSTHOOK: query: -- load from file load data local inpath '../../data/files/srcbucket0.txt' overwrite into table char1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@char1 PREHOOK: query: select * from char1 order by key, value limit 2 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/char_2.q.out b/ql/src/test/results/clientpositive/char_2.q.out index e6b8eab..1f98630 100644 --- a/ql/src/test/results/clientpositive/char_2.q.out +++ b/ql/src/test/results/clientpositive/char_2.q.out @@ -7,11 +7,13 @@ PREHOOK: query: create table char_2 ( value char(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char_2 ( key char(10), value char(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_2 PREHOOK: query: insert overwrite table char_2 select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/char_join1.q.out b/ql/src/test/results/clientpositive/char_join1.q.out index 36613d1..de04dc3 100644 --- a/ql/src/test/results/clientpositive/char_join1.q.out +++ b/ql/src/test/results/clientpositive/char_join1.q.out @@ -15,51 +15,63 @@ PREHOOK: query: create table char_join1_ch1 ( c2 char(10) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char_join1_ch1 ( c1 int, c2 char(10) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_join1_ch1 PREHOOK: query: create table char_join1_ch2 ( c1 int, c2 char(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char_join1_ch2 ( c1 int, c2 char(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_join1_ch2 PREHOOK: query: create table char_join1_str ( c1 int, c2 string ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char_join1_str ( c1 int, c2 string ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_join1_str PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_join1_ch1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@char_join1_ch1 POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_join1_ch1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@char_join1_ch1 PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_join1_ch2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@char_join1_ch2 POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_join1_ch2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@char_join1_ch2 PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_join1_str PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@char_join1_str POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_join1_str POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@char_join1_str PREHOOK: query: -- Join char with same length char select * from char_join1_ch1 a join char_join1_ch1 b on (a.c2 = b.c2) order by a.c1 diff --git a/ql/src/test/results/clientpositive/char_nested_types.q.out b/ql/src/test/results/clientpositive/char_nested_types.q.out index 7fff702..8a01d34 100644 --- a/ql/src/test/results/clientpositive/char_nested_types.q.out +++ b/ql/src/test/results/clientpositive/char_nested_types.q.out @@ -24,8 +24,10 @@ POSTHOOK: query: drop table char_nested_view POSTHOOK: type: DROPTABLE PREHOOK: query: create table char_nested_1 (key int, value char(20)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char_nested_1 (key int, value char(20)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_nested_1 PREHOOK: query: insert overwrite table char_nested_1 select key, value from src order by key limit 1 @@ -42,9 +44,11 @@ POSTHOOK: Lineage: char_nested_1.value EXPRESSION [(src)src.FieldSchema(name:val PREHOOK: query: -- arrays create table char_nested_array (c1 array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- arrays create table char_nested_array (c1 array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_nested_array POSTHOOK: Lineage: char_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: char_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -84,9 +88,11 @@ POSTHOOK: Lineage: char_nested_array.c1 EXPRESSION [(char_nested_1)char_nested_1 PREHOOK: query: -- maps create table char_nested_map (c1 map) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- maps create table char_nested_map (c1 map) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_nested_map POSTHOOK: Lineage: char_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: char_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -130,9 +136,11 @@ POSTHOOK: Lineage: char_nested_map.c1 EXPRESSION [(char_nested_1)char_nested_1.F PREHOOK: query: -- structs create table char_nested_struct (c1 struct) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- structs create table char_nested_struct (c1 struct) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_nested_struct POSTHOOK: Lineage: char_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: char_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/char_serde.q.out b/ql/src/test/results/clientpositive/char_serde.q.out index 76949b2..54caab2 100644 --- a/ql/src/test/results/clientpositive/char_serde.q.out +++ b/ql/src/test/results/clientpositive/char_serde.q.out @@ -35,6 +35,7 @@ with serdeproperties ( ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- RegexSerDe -- @@ -48,12 +49,15 @@ with serdeproperties ( ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_serde_regex PREHOOK: query: load data local inpath '../../data/files/srcbucket0.txt' overwrite into table char_serde_regex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@char_serde_regex POSTHOOK: query: load data local inpath '../../data/files/srcbucket0.txt' overwrite into table char_serde_regex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@char_serde_regex PREHOOK: query: select * from char_serde_regex limit 5 PREHOOK: type: QUERY @@ -89,6 +93,7 @@ create table char_serde_lb ( value char(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- LazyBinary -- @@ -97,6 +102,7 @@ create table char_serde_lb ( value char(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_serde_lb PREHOOK: query: alter table char_serde_lb set serde 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' PREHOOK: type: ALTERTABLE_SERIALIZER @@ -156,6 +162,7 @@ create table char_serde_ls ( value char(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- LazySimple -- @@ -164,6 +171,7 @@ create table char_serde_ls ( value char(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_serde_ls POSTHOOK: Lineage: char_serde_lb.key SIMPLE [(char_serde_regex)char_serde_regex.FieldSchema(name:key, type:char(15), comment:from deserializer), ] POSTHOOK: Lineage: char_serde_lb.value SIMPLE [(char_serde_regex)char_serde_regex.FieldSchema(name:value, type:char(20), comment:from deserializer), ] @@ -233,6 +241,7 @@ create table char_serde_c ( value char(20) ) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- Columnar -- @@ -241,6 +250,7 @@ create table char_serde_c ( value char(20) ) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_serde_c POSTHOOK: Lineage: char_serde_lb.key SIMPLE [(char_serde_regex)char_serde_regex.FieldSchema(name:key, type:char(15), comment:from deserializer), ] POSTHOOK: Lineage: char_serde_lb.value SIMPLE [(char_serde_regex)char_serde_regex.FieldSchema(name:value, type:char(20), comment:from deserializer), ] @@ -320,6 +330,7 @@ create table char_serde_lbc ( value char(20) ) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- LazyBinaryColumnar -- @@ -328,6 +339,7 @@ create table char_serde_lbc ( value char(20) ) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_serde_lbc POSTHOOK: Lineage: char_serde_c.key SIMPLE [(char_serde_ls)char_serde_ls.FieldSchema(name:key, type:char(15), comment:from deserializer), ] POSTHOOK: Lineage: char_serde_c.value SIMPLE [(char_serde_ls)char_serde_ls.FieldSchema(name:value, type:char(20), comment:from deserializer), ] @@ -417,6 +429,7 @@ create table char_serde_orc ( value char(20) ) stored as orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- ORC -- @@ -425,6 +438,7 @@ create table char_serde_orc ( value char(20) ) stored as orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_serde_orc POSTHOOK: Lineage: char_serde_c.key SIMPLE [(char_serde_ls)char_serde_ls.FieldSchema(name:key, type:char(15), comment:from deserializer), ] POSTHOOK: Lineage: char_serde_c.value SIMPLE [(char_serde_ls)char_serde_ls.FieldSchema(name:value, type:char(20), comment:from deserializer), ] diff --git a/ql/src/test/results/clientpositive/char_udf1.q.out b/ql/src/test/results/clientpositive/char_udf1.q.out index 4843e8a..3cd2627 100644 --- a/ql/src/test/results/clientpositive/char_udf1.q.out +++ b/ql/src/test/results/clientpositive/char_udf1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table char_udf_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table char_udf_1 (c1 string, c2 string, c3 char(10), c4 char(20)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char_udf_1 (c1 string, c2 string, c3 char(10), c4 char(20)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_udf_1 PREHOOK: query: insert overwrite table char_udf_1 select key, value, key, value from src where key = '238' limit 1 diff --git a/ql/src/test/results/clientpositive/char_union1.q.out b/ql/src/test/results/clientpositive/char_union1.q.out index 9d007a3..8df98a7 100644 --- a/ql/src/test/results/clientpositive/char_union1.q.out +++ b/ql/src/test/results/clientpositive/char_union1.q.out @@ -15,51 +15,63 @@ PREHOOK: query: create table char_union1_ch1 ( c2 char(10) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char_union1_ch1 ( c1 int, c2 char(10) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_union1_ch1 PREHOOK: query: create table char_union1_ch2 ( c1 int, c2 char(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char_union1_ch2 ( c1 int, c2 char(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_union1_ch2 PREHOOK: query: create table char_union1_str ( c1 int, c2 string ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table char_union1_str ( c1 int, c2 string ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_union1_str PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_union1_ch1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@char_union1_ch1 POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_union1_ch1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@char_union1_ch1 PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_union1_ch2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@char_union1_ch2 POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_union1_ch2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@char_union1_ch2 PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_union1_str PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@char_union1_str POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table char_union1_str POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@char_union1_str PREHOOK: query: -- union char with same length char select * from ( diff --git a/ql/src/test/results/clientpositive/char_varchar_udf.q.out b/ql/src/test/results/clientpositive/char_varchar_udf.q.out index a8039ab..285fd4d 100644 --- a/ql/src/test/results/clientpositive/char_varchar_udf.q.out +++ b/ql/src/test/results/clientpositive/char_varchar_udf.q.out @@ -4,14 +4,18 @@ POSTHOOK: query: DROP TABLE IF EXISTS char_varchar_udf POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE char_varchar_udf (c char(8), vc varchar(10)) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE char_varchar_udf (c char(8), vc varchar(10)) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@char_varchar_udf PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/char_varchar_udf.txt' INTO TABLE char_varchar_udf PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@char_varchar_udf POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/char_varchar_udf.txt' INTO TABLE char_varchar_udf POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@char_varchar_udf PREHOOK: query: SELECT ROUND(c, 2), ROUND(vc, 3) FROM char_varchar_udf PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/column_access_stats.q.out b/ql/src/test/results/clientpositive/column_access_stats.q.out index dea25e5..7eee4ba 100644 --- a/ql/src/test/results/clientpositive/column_access_stats.q.out +++ b/ql/src/test/results/clientpositive/column_access_stats.q.out @@ -2,15 +2,20 @@ PREHOOK: query: -- This test is used for testing the ColumnAccessAnalyzer CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default PREHOOK: query: CREATE TABLE T4(key STRING, val STRING) PARTITIONED BY (p STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default PREHOOK: query: -- Simple select queries SELECT key FROM T1 ORDER BY key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out b/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out index f5ad951..0a45736 100644 --- a/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out +++ b/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE columnarserde_create_shortcut(a array, b array, c map, d int, e string) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE columnarserde_create_shortcut(a array, b array, c map, d int, e string) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@columnarserde_create_shortcut PREHOOK: query: EXPLAIN FROM src_thrift @@ -122,8 +124,10 @@ POSTHOOK: Lineage: columnarserde_create_shortcut.e SIMPLE [(src_thrift)src_thrif NULL NULL NULL 0 NULL PREHOOK: query: CREATE table columnShortcutTable (key STRING, value STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE table columnShortcutTable (key STRING, value STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@columnShortcutTable POSTHOOK: Lineage: columnarserde_create_shortcut.a SIMPLE [(src_thrift)src_thrift.FieldSchema(name:lint, type:array, comment:from deserializer), ] POSTHOOK: Lineage: columnarserde_create_shortcut.b SIMPLE [(src_thrift)src_thrift.FieldSchema(name:lstring, type:array, comment:from deserializer), ] diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out index 97a37eb..46c3f12 100644 --- a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out +++ b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out @@ -5,22 +5,28 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@Employee_Part PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee.dat" INTO TABLE Employee_Part partition(employeeSalary=2000.0) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee.dat" INTO TABLE Employee_Part partition(employeeSalary=2000.0) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=2000.0 PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee.dat" INTO TABLE Employee_Part partition(employeeSalary=4000.0) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employee_part POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee.dat" INTO TABLE Employee_Part partition(employeeSalary=4000.0) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employee_part POSTHOOK: Output: default@employee_part@employeesalary=4000.0 PREHOOK: query: explain diff --git a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out index eb1613b..c2cae9f 100644 --- a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out +++ b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE UserVisits_web_text_none ( avgTimeOnSite int) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE UserVisits_web_text_none ( sourceIP string, destURL string, @@ -26,12 +27,15 @@ POSTHOOK: query: CREATE TABLE UserVisits_web_text_none ( avgTimeOnSite int) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@UserVisits_web_text_none PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/UserVisits.dat" INTO TABLE UserVisits_web_text_none PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@uservisits_web_text_none POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/UserVisits.dat" INTO TABLE UserVisits_web_text_none POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@uservisits_web_text_none PREHOOK: query: explain analyze table UserVisits_web_text_none compute statistics for columns sourceIP, avgTimeOnSite, adRevenue @@ -224,6 +228,7 @@ PREHOOK: query: CREATE TABLE empty_tab( e binary) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE empty_tab( a int, b double, @@ -232,6 +237,7 @@ POSTHOOK: query: CREATE TABLE empty_tab( e binary) row format delimited fields terminated by '|' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@empty_tab PREHOOK: query: explain analyze table empty_tab compute statistics for columns a,b,c,d,e diff --git a/ql/src/test/results/clientpositive/combine1.q.out b/ql/src/test/results/clientpositive/combine1.q.out index a4fa3c1..79d571b 100644 --- a/ql/src/test/results/clientpositive/combine1.q.out +++ b/ql/src/test/results/clientpositive/combine1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table combine1_1(key string, value string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table combine1_1(key string, value string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@combine1_1 PREHOOK: query: insert overwrite table combine1_1 select * from src diff --git a/ql/src/test/results/clientpositive/combine2_hadoop20.q.out b/ql/src/test/results/clientpositive/combine2_hadoop20.q.out index 5ba4f1f..16134d9 100644 --- a/ql/src/test/results/clientpositive/combine2_hadoop20.q.out +++ b/ql/src/test/results/clientpositive/combine2_hadoop20.q.out @@ -8,12 +8,14 @@ PREHOOK: query: -- EXCLUDE_OS_WINDOWS create table combine2(key string) partitioned by (value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- EXCLUDE_OS_WINDOWS -- excluded on windows because of difference in file name encoding logic create table combine2(key string) partitioned by (value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@combine2 PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) -- This test sets mapred.max.split.size=256 and hive.merge.smallfiles.avgsize=0 diff --git a/ql/src/test/results/clientpositive/combine3.q.out b/ql/src/test/results/clientpositive/combine3.q.out index 8e973ea..4fb7930 100644 --- a/ql/src/test/results/clientpositive/combine3.q.out +++ b/ql/src/test/results/clientpositive/combine3.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table combine_3_srcpart_seq_rc POSTHOOK: type: DROPTABLE PREHOOK: query: create table combine_3_srcpart_seq_rc (key int , value string) partitioned by (ds string, hr string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table combine_3_srcpart_seq_rc (key int , value string) partitioned by (ds string, hr string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@combine_3_srcpart_seq_rc PREHOOK: query: insert overwrite table combine_3_srcpart_seq_rc partition (ds="2010-08-03", hr="00") select * from src PREHOOK: type: QUERY @@ -135,8 +137,10 @@ POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).key E POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE combine_3_srcpart_seq_rc_bucket(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE combine_3_srcpart_seq_rc_bucket(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@combine_3_srcpart_seq_rc_bucket POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/compute_stats_binary.q.out b/ql/src/test/results/clientpositive/compute_stats_binary.q.out index b3d373d..d2e0b05 100644 --- a/ql/src/test/results/clientpositive/compute_stats_binary.q.out +++ b/ql/src/test/results/clientpositive/compute_stats_binary.q.out @@ -1,15 +1,19 @@ PREHOOK: query: create table tab_binary(a binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab_binary(a binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab_binary PREHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/binary.txt" INTO TABLE tab_binary PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tab_binary POSTHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/binary.txt" INTO TABLE tab_binary POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tab_binary PREHOOK: query: select count(*) from tab_binary PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/compute_stats_boolean.q.out b/ql/src/test/results/clientpositive/compute_stats_boolean.q.out index 7bf7c4a..440bc16 100644 --- a/ql/src/test/results/clientpositive/compute_stats_boolean.q.out +++ b/ql/src/test/results/clientpositive/compute_stats_boolean.q.out @@ -1,15 +1,19 @@ PREHOOK: query: create table tab_bool(a boolean) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab_bool(a boolean) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab_bool PREHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/bool.txt" INTO TABLE tab_bool PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tab_bool POSTHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/bool.txt" INTO TABLE tab_bool POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tab_bool PREHOOK: query: select count(*) from tab_bool PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/compute_stats_double.q.out b/ql/src/test/results/clientpositive/compute_stats_double.q.out index 6ff34b7..8915e70 100644 --- a/ql/src/test/results/clientpositive/compute_stats_double.q.out +++ b/ql/src/test/results/clientpositive/compute_stats_double.q.out @@ -1,15 +1,19 @@ PREHOOK: query: create table tab_double(a double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab_double(a double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab_double PREHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/double.txt" INTO TABLE tab_double PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tab_double POSTHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/double.txt" INTO TABLE tab_double POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tab_double PREHOOK: query: select count(*) from tab_double PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/compute_stats_empty_table.q.out b/ql/src/test/results/clientpositive/compute_stats_empty_table.q.out index 8dffaf3..50d6c8d 100644 --- a/ql/src/test/results/clientpositive/compute_stats_empty_table.q.out +++ b/ql/src/test/results/clientpositive/compute_stats_empty_table.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tab_empty(a boolean, b int, c double, d string, e binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab_empty(a boolean, b int, c double, d string, e binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab_empty PREHOOK: query: select count(*) from tab_empty PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/compute_stats_long.q.out b/ql/src/test/results/clientpositive/compute_stats_long.q.out index 5ad8e08..2f5cbdd 100644 --- a/ql/src/test/results/clientpositive/compute_stats_long.q.out +++ b/ql/src/test/results/clientpositive/compute_stats_long.q.out @@ -1,15 +1,19 @@ PREHOOK: query: create table tab_int(a int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab_int(a int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab_int PREHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/int.txt" INTO TABLE tab_int PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tab_int POSTHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/int.txt" INTO TABLE tab_int POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tab_int PREHOOK: query: select count(*) from tab_int PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/compute_stats_string.q.out b/ql/src/test/results/clientpositive/compute_stats_string.q.out index c450159..1d0e347 100644 --- a/ql/src/test/results/clientpositive/compute_stats_string.q.out +++ b/ql/src/test/results/clientpositive/compute_stats_string.q.out @@ -1,15 +1,19 @@ PREHOOK: query: create table tab_string(a string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tab_string(a string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab_string PREHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/string.txt" INTO TABLE tab_string PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tab_string POSTHOOK: query: -- insert some data LOAD DATA LOCAL INPATH "../../data/files/string.txt" INTO TABLE tab_string POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tab_string PREHOOK: query: select count(*) from tab_string PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/concatenate_inherit_table_location.q.out b/ql/src/test/results/clientpositive/concatenate_inherit_table_location.q.out index 202e9f2..f3a7f02 100644 --- a/ql/src/test/results/clientpositive/concatenate_inherit_table_location.q.out +++ b/ql/src/test/results/clientpositive/concatenate_inherit_table_location.q.out @@ -2,10 +2,14 @@ PREHOOK: query: CREATE TABLE citl_table (key STRING, value STRING) PARTITIONED B STORED AS RCFILE #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE citl_table (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@citl_table PREHOOK: query: INSERT OVERWRITE TABLE citl_table PARTITION (part = '1') SELECT * FROM src PREHOOK: type: QUERY @@ -15,6 +19,7 @@ PREHOOK: Output: default@citl_table@part=1 PREHOOK: type: ALTERTABLE_LOCATION PREHOOK: Input: default@citl_table PREHOOK: Output: default@citl_table +#### A masked pattern was here #### PREHOOK: query: ALTER TABLE citl_table PARTITION (part = '1') CONCATENATE PREHOOK: type: ALTER_PARTITION_MERGE PREHOOK: Input: default@citl_table diff --git a/ql/src/test/results/clientpositive/convert_enum_to_string.q.out b/ql/src/test/results/clientpositive/convert_enum_to_string.q.out index aacedd1..3d504c1 100644 --- a/ql/src/test/results/clientpositive/convert_enum_to_string.q.out +++ b/ql/src/test/results/clientpositive/convert_enum_to_string.q.out @@ -7,6 +7,7 @@ create table convert_enum_to_string "serialization.class"="org.apache.hadoop.hive.serde2.thrift.test.MegaStruct", "serialization.format"="org.apache.thrift.protocol.TBinaryProtocol") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Ensure Enum fields are converted to strings (instead of struct) create table convert_enum_to_string @@ -16,6 +17,7 @@ create table convert_enum_to_string "serialization.class"="org.apache.hadoop.hive.serde2.thrift.test.MegaStruct", "serialization.format"="org.apache.thrift.protocol.TBinaryProtocol") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@convert_enum_to_string PREHOOK: query: describe convert_enum_to_string PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/correlationoptimizer11.q.out b/ql/src/test/results/clientpositive/correlationoptimizer11.q.out index 5d81e46..c05fce5 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer11.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer11.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests in this file are used to make sure Correlation Optimize CREATE TABLE part_table(key string, value string) PARTITIONED BY (partitionId int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests in this file are used to make sure Correlation Optimizer -- can correctly handle tables with partitions CREATE TABLE part_table(key string, value string) PARTITIONED BY (partitionId int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_table PREHOOK: query: INSERT OVERWRITE TABLE part_table PARTITION (partitionId=1) SELECT key, value FROM src ORDER BY key, value LIMIT 100 diff --git a/ql/src/test/results/clientpositive/correlationoptimizer13.q.out b/ql/src/test/results/clientpositive/correlationoptimizer13.q.out index 448d4d2..3fabfa5 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer13.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer13.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp PREHOOK: query: INSERT OVERWRITE TABLE tmp SELECT x.key, y.key, x.value, y.value FROM src x JOIN src y ON (x.key = y.key) diff --git a/ql/src/test/results/clientpositive/correlationoptimizer4.q.out b/ql/src/test/results/clientpositive/correlationoptimizer4.q.out index 5d31e4e..6adbc4a 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer4.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer4.q.out @@ -1,35 +1,47 @@ PREHOOK: query: CREATE TABLE T1(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: CREATE TABLE T3(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: -- When Correlation Optimizer is turned off, this query will be evaluated -- by 3 MR jobs. diff --git a/ql/src/test/results/clientpositive/correlationoptimizer5.q.out b/ql/src/test/results/clientpositive/correlationoptimizer5.q.out index adff359..4991137 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer5.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer5.q.out @@ -1,61 +1,83 @@ PREHOOK: query: CREATE TABLE T1(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: CREATE TABLE T3(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: CREATE TABLE T4(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T4(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T4 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv5.txt' INTO TABLE T4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv5.txt' INTO TABLE T4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t4 PREHOOK: query: CREATE TABLE dest_co1(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_co1(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_co1 PREHOOK: query: CREATE TABLE dest_co2(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_co2(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_co2 PREHOOK: query: CREATE TABLE dest_co3(key INT, val STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_co3(key INT, val STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_co3 PREHOOK: query: -- When Correlation Optimizer is turned off, 3 MR jobs are needed. -- When Correlation Optimizer is turned on, only a single MR job is needed. diff --git a/ql/src/test/results/clientpositive/correlationoptimizer9.q.out b/ql/src/test/results/clientpositive/correlationoptimizer9.q.out index 31b1be6..253ea14 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer9.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer9.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp PREHOOK: query: INSERT OVERWRITE TABLE tmp SELECT x.key, y.key, x.value, y.value FROM src x JOIN src y ON (x.key = y.key) diff --git a/ql/src/test/results/clientpositive/count.q.out b/ql/src/test/results/clientpositive/count.q.out index 3ca01b2..eb048b6 100644 --- a/ql/src/test/results/clientpositive/count.q.out +++ b/ql/src/test/results/clientpositive/count.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table abcd (a int, b int, c int, d int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table abcd (a int, b int, c int, d int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@abcd PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in4.txt' INTO TABLE abcd PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@abcd POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in4.txt' INTO TABLE abcd POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@abcd PREHOOK: query: select * from abcd PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/cp_mj_rc.q.out b/ql/src/test/results/clientpositive/cp_mj_rc.q.out index 5a73e2a..a566753 100644 --- a/ql/src/test/results/clientpositive/cp_mj_rc.q.out +++ b/ql/src/test/results/clientpositive/cp_mj_rc.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table src_six_columns (k1 string, v1 string, k2 string, v2 string, k3 string, v3 string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_six_columns (k1 string, v1 string, k2 string, v2 string, k3 string, v3 string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_six_columns PREHOOK: query: insert overwrite table src_six_columns select value, value, key, value, value, value from src PREHOOK: type: QUERY @@ -19,8 +21,10 @@ POSTHOOK: Lineage: src_six_columns.v2 SIMPLE [(src)src.FieldSchema(name:value, t POSTHOOK: Lineage: src_six_columns.v3 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table src_two_columns (k1 string, v1 string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_two_columns (k1 string, v1 string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_two_columns POSTHOOK: Lineage: src_six_columns.k1 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: src_six_columns.k2 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/create_1.q.out b/ql/src/test/results/clientpositive/create_1.q.out index 2055c95..49e14ad 100644 --- a/ql/src/test/results/clientpositive/create_1.q.out +++ b/ql/src/test/results/clientpositive/create_1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE @@ -23,8 +25,10 @@ POSTHOOK: query: CREATE TABLE IF NOT EXISTS table1 (a STRING, b STRING) STORED A POSTHOOK: type: CREATETABLE PREHOOK: query: CREATE TABLE IF NOT EXISTS table2 (a STRING, b INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE IF NOT EXISTS table2 (a STRING, b INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 PREHOOK: query: DESCRIBE table2 PREHOOK: type: DESCTABLE @@ -44,10 +48,12 @@ PREHOOK: query: CREATE TABLE table3 (a STRING, b STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table3 (a STRING, b STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table3 PREHOOK: query: DESCRIBE table3 PREHOOK: type: DESCTABLE @@ -67,10 +73,12 @@ PREHOOK: query: CREATE TABLE table4 (a STRING, b STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table4 (a STRING, b STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table4 PREHOOK: query: DESCRIBE table4 PREHOOK: type: DESCTABLE @@ -90,10 +98,12 @@ PREHOOK: query: CREATE TABLE table5 (a STRING, b STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table5 (a STRING, b STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table5 PREHOOK: query: DESCRIBE table5 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out b/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out index 54f8c66..17a7bb9 100644 --- a/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out +++ b/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out @@ -5,6 +5,7 @@ PREHOOK: query: -- Test stored as directories CREATE TABLE if not exists stored_as_dirs_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)) stored as DIRECTORIES PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test stored as directories -- it covers a few cases @@ -12,6 +13,7 @@ POSTHOOK: query: -- Test stored as directories CREATE TABLE if not exists stored_as_dirs_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)) stored as DIRECTORIES POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stored_as_dirs_multiple PREHOOK: query: describe formatted stored_as_dirs_multiple PREHOOK: type: DESCTABLE @@ -143,9 +145,11 @@ Storage Desc Params: PREHOOK: query: -- 4. alter a table to stored as directories CREATE TABLE stored_as_dirs_single (key STRING, value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- 4. alter a table to stored as directories CREATE TABLE stored_as_dirs_single (key STRING, value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stored_as_dirs_single PREHOOK: query: alter table stored_as_dirs_single SKEWED BY (key) ON ('1','5','6') stored as DIRECTORIES @@ -293,9 +297,11 @@ Storage Desc Params: PREHOOK: query: -- 7. create table like create table stored_as_dirs_single_like like stored_as_dirs_single PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- 7. create table like create table stored_as_dirs_single_like like stored_as_dirs_single POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stored_as_dirs_single_like PREHOOK: query: describe formatted stored_as_dirs_single_like PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/create_default_prop.q.out b/ql/src/test/results/clientpositive/create_default_prop.q.out index 95b8ef0..21a60f8 100644 --- a/ql/src/test/results/clientpositive/create_default_prop.q.out +++ b/ql/src/test/results/clientpositive/create_default_prop.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE table_p1 (a STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table_p1 (a STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_p1 PREHOOK: query: DESC EXTENDED table_p1 PREHOOK: type: DESCTABLE @@ -12,8 +14,10 @@ a string None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table_p2 LIKE table_p1 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table_p2 LIKE table_p1 POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_p2 PREHOOK: query: DESC EXTENDED table_p2 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/create_escape.q.out b/ql/src/test/results/clientpositive/create_escape.q.out index de32533..faba8fd 100644 --- a/ql/src/test/results/clientpositive/create_escape.q.out +++ b/ql/src/test/results/clientpositive/create_escape.q.out @@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE table1 (a STRING, b STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' ESCAPED BY '\\' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table1 (a STRING, b STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' ESCAPED BY '\\' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/create_genericudf.q.out b/ql/src/test/results/clientpositive/create_genericudf.q.out index f86ad6a..bf1f4ac 100644 --- a/ql/src/test/results/clientpositive/create_genericudf.q.out +++ b/ql/src/test/results/clientpositive/create_genericudf.q.out @@ -16,8 +16,10 @@ POSTHOOK: query: CREATE TEMPORARY FUNCTION test_translate AS 'org.apache.hadoop. POSTHOOK: type: CREATEFUNCTION PREHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 STRING, c6 STRING, c7 STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 STRING, c6 STRING, c7 STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 diff --git a/ql/src/test/results/clientpositive/create_insert_outputformat.q.out b/ql/src/test/results/clientpositive/create_insert_outputformat.q.out index ce3cb09..90e1ddd 100644 --- a/ql/src/test/results/clientpositive/create_insert_outputformat.q.out +++ b/ql/src/test/results/clientpositive/create_insert_outputformat.q.out @@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE table_test_output_format(key INT, value STRING) STO INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table_test_output_format(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_test_output_format PREHOOK: query: FROM src INSERT OVERWRITE TABLE table_test_output_format SELECT src.key, src.value LIMIT 10 @@ -31,10 +33,12 @@ PREHOOK: query: CREATE TABLE table_test_output_format_sequencefile(key INT, valu INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table_test_output_format_sequencefile(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_test_output_format_sequencefile POSTHOOK: Lineage: table_test_output_format.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -66,10 +70,12 @@ PREHOOK: query: CREATE TABLE table_test_output_format_hivesequencefile(key INT, INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table_test_output_format_hivesequencefile(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_test_output_format_hivesequencefile POSTHOOK: Lineage: table_test_output_format.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/create_like.q.out b/ql/src/test/results/clientpositive/create_like.q.out index c740dd9..97fdee9 100644 --- a/ql/src/test/results/clientpositive/create_like.q.out +++ b/ql/src/test/results/clientpositive/create_like.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: DESCRIBE FORMATTED table1 PREHOOK: type: DESCTABLE @@ -34,8 +36,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: CREATE TABLE table2 LIKE table1 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table2 LIKE table1 POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 PREHOOK: query: DESCRIBE FORMATTED table2 PREHOOK: type: DESCTABLE @@ -76,8 +80,10 @@ POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table2 LIKE table1 POSTHOOK: type: CREATETABLE PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE table1 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE table1 POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table3 PREHOOK: query: DESCRIBE FORMATTED table3 PREHOOK: type: DESCTABLE @@ -161,7 +167,11 @@ POSTHOOK: Lineage: table2.b SIMPLE [(src)src.FieldSchema(name:value, type:string #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@table4 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), ] @@ -170,7 +180,11 @@ POSTHOOK: Lineage: table2.b SIMPLE [(src)src.FieldSchema(name:value, type:string #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@table5 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), ] @@ -257,7 +271,11 @@ POSTHOOK: Lineage: table2.b SIMPLE [(src)src.FieldSchema(name:value, type:string #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@table4 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), ] diff --git a/ql/src/test/results/clientpositive/create_like2.q.out b/ql/src/test/results/clientpositive/create_like2.q.out index e02e2ad..82cb042 100644 --- a/ql/src/test/results/clientpositive/create_like2.q.out +++ b/ql/src/test/results/clientpositive/create_like2.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests the copying over of Table Parameters according to a Hiv CREATE TABLE table1(a INT, b STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests the copying over of Table Parameters according to a HiveConf setting -- when doing a CREATE TABLE LIKE. CREATE TABLE table1(a INT, b STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: ALTER TABLE table1 SET TBLPROPERTIES ('a'='1', 'b'='2', 'c'='3', 'd' = '4') PREHOOK: type: ALTERTABLE_PROPERTIES @@ -19,8 +21,10 @@ POSTHOOK: Input: default@table1 POSTHOOK: Output: default@table1 PREHOOK: query: CREATE TABLE table2 LIKE table1 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table2 LIKE table1 POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 PREHOOK: query: DESC FORMATTED table2 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/create_like_tbl_props.q.out b/ql/src/test/results/clientpositive/create_like_tbl_props.q.out index 318aea8..8e64eab 100644 --- a/ql/src/test/results/clientpositive/create_like_tbl_props.q.out +++ b/ql/src/test/results/clientpositive/create_like_tbl_props.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Test that CREATE TABLE LIKE commands can take explicit table CREATE TABLE test_table LIKE src TBLPROPERTIES('key'='value') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test that CREATE TABLE LIKE commands can take explicit table properties CREATE TABLE test_table LIKE src TBLPROPERTIES('key'='value') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: DESC FORMATTED test_table PREHOOK: type: DESCTABLE @@ -41,10 +43,12 @@ PREHOOK: query: --Test that CREATE TABLE LIKE commands can take default table pr CREATE TABLE test_table1 LIKE src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: --Test that CREATE TABLE LIKE commands can take default table properties CREATE TABLE test_table1 LIKE src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: DESC FORMATTED test_table1 PREHOOK: type: DESCTABLE @@ -80,10 +84,12 @@ PREHOOK: query: -- Test that CREATE TABLE LIKE commands can take default and exp CREATE TABLE test_table2 LIKE src TBLPROPERTIES('key2' = 'value2') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test that CREATE TABLE LIKE commands can take default and explicit table properties CREATE TABLE test_table2 LIKE src TBLPROPERTIES('key2' = 'value2') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: DESC FORMATTED test_table2 PREHOOK: type: DESCTABLE @@ -120,10 +126,12 @@ PREHOOK: query: -- Test that properties inherited are overwritten by explicitly CREATE TABLE test_table3 LIKE test_table2 TBLPROPERTIES('key2' = 'value3') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test that properties inherited are overwritten by explicitly set ones CREATE TABLE test_table3 LIKE test_table2 TBLPROPERTIES('key2' = 'value3') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 PREHOOK: query: DESC FORMATTED test_table3 PREHOOK: type: DESCTABLE @@ -169,8 +177,10 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@test_view PREHOOK: query: CREATE TABLE test_table4 LIKE test_view TBLPROPERTIES('key'='value') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table4 LIKE test_view TBLPROPERTIES('key'='value') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table4 PREHOOK: query: DESC FORMATTED test_table4 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/create_like_view.q.out b/ql/src/test/results/clientpositive/create_like_view.q.out index 48d4992..c56da79 100644 --- a/ql/src/test/results/clientpositive/create_like_view.q.out +++ b/ql/src/test/results/clientpositive/create_like_view.q.out @@ -16,8 +16,10 @@ POSTHOOK: query: DROP VIEW IF EXISTS view1 POSTHOOK: type: DROPVIEW PREHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE @@ -63,8 +65,10 @@ POSTHOOK: Input: default@table1 POSTHOOK: Output: default@view1 PREHOOK: query: CREATE TABLE table2 LIKE view1 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table2 LIKE view1 POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 PREHOOK: query: DESCRIBE table2 PREHOOK: type: DESCTABLE @@ -111,8 +115,10 @@ POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table2 LIKE view1 POSTHOOK: type: CREATETABLE PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE view1 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE view1 POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table3 PREHOOK: query: DESCRIBE table3 PREHOOK: type: DESCTABLE @@ -250,8 +256,10 @@ POSTHOOK: Lineage: table2.a SIMPLE [(src)src.FieldSchema(name:key, type:string, POSTHOOK: Lineage: table2.b SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table table1 like view1 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table1 like view1 POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 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), ] diff --git a/ql/src/test/results/clientpositive/create_merge_compressed.q.out b/ql/src/test/results/clientpositive/create_merge_compressed.q.out index 4340878..078ad7f 100644 --- a/ql/src/test/results/clientpositive/create_merge_compressed.q.out +++ b/ql/src/test/results/clientpositive/create_merge_compressed.q.out @@ -1,18 +1,24 @@ PREHOOK: query: create table src_rc_merge_test(key int, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_rc_merge_test(key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_rc_merge_test PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_rc_merge_test POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_rc_merge_test PREHOOK: query: create table tgt_rc_merge_test(key int, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tgt_rc_merge_test(key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tgt_rc_merge_test PREHOOK: query: insert into table tgt_rc_merge_test select * from src_rc_merge_test PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/create_nested_type.q.out b/ql/src/test/results/clientpositive/create_nested_type.q.out index 6a7b533..6da098b 100644 --- a/ql/src/test/results/clientpositive/create_nested_type.q.out +++ b/ql/src/test/results/clientpositive/create_nested_type.q.out @@ -5,6 +5,7 @@ PREHOOK: query: CREATE TABLE table1 ( d MAP> ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table1 ( a STRING, b ARRAY, @@ -12,6 +13,7 @@ POSTHOOK: query: CREATE TABLE table1 ( d MAP> ) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE @@ -33,9 +35,11 @@ d map> None #### A masked pattern was here #### PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/create_nested_type.txt' OVERWRITE INTO TABLE table1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/create_nested_type.txt' OVERWRITE INTO TABLE table1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table1 PREHOOK: query: SELECT * from table1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/create_or_replace_view.q.out b/ql/src/test/results/clientpositive/create_or_replace_view.q.out index fe54ab5..a72d2ab 100644 --- a/ql/src/test/results/clientpositive/create_or_replace_view.q.out +++ b/ql/src/test/results/clientpositive/create_or_replace_view.q.out @@ -55,22 +55,26 @@ PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@srcpart PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 PREHOOK: Input: default@v +PREHOOK: Output: default@v POSTHOOK: query: alter view v add partition (ds='2008-04-08',hr='11') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@v +POSTHOOK: Output: default@v POSTHOOK: Output: default@v@ds=2008-04-08/hr=11 PREHOOK: query: alter view v add partition (ds='2008-04-08',hr='12') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@srcpart PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@v +PREHOOK: Output: default@v POSTHOOK: query: alter view v add partition (ds='2008-04-08',hr='12') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 POSTHOOK: Input: default@v +POSTHOOK: Output: default@v POSTHOOK: Output: default@v@ds=2008-04-08/hr=12 PREHOOK: query: select * from v where value='val_409' and ds='2008-04-08' and hr='11' PREHOOK: type: QUERY @@ -271,9 +275,11 @@ POSTHOOK: Output: default@v PREHOOK: query: -- updating to fix view with invalid definition create table srcpart_temp like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- updating to fix view with invalid definition create table srcpart_temp like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_temp PREHOOK: query: create view v partitioned on (ds, hr) as select * from srcpart_temp PREHOOK: type: CREATEVIEW diff --git a/ql/src/test/results/clientpositive/create_skewed_table1.q.out b/ql/src/test/results/clientpositive/create_skewed_table1.q.out index 586393d..d840831 100644 --- a/ql/src/test/results/clientpositive/create_skewed_table1.q.out +++ b/ql/src/test/results/clientpositive/create_skewed_table1.q.out @@ -1,17 +1,23 @@ PREHOOK: query: CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON ('1','5','6') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON ('1','5','6') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@list_bucket_single PREHOOK: query: CREATE TABLE list_bucket_single_2 (key STRING, value STRING) SKEWED BY (key) ON ((1),(5),(6)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE list_bucket_single_2 (key STRING, value STRING) SKEWED BY (key) ON ((1),(5),(6)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@list_bucket_single_2 PREHOOK: query: CREATE TABLE list_bucket_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE list_bucket_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@list_bucket_multiple PREHOOK: query: describe formatted list_bucket_single_2 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/create_struct_table.q.out b/ql/src/test/results/clientpositive/create_struct_table.q.out index a6bc49e..9127316 100644 --- a/ql/src/test/results/clientpositive/create_struct_table.q.out +++ b/ql/src/test/results/clientpositive/create_struct_table.q.out @@ -3,19 +3,23 @@ row format delimited fields terminated by '\t' collection items terminated by '\001' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table abc(strct struct) row format delimited fields terminated by '\t' collection items terminated by '\001' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@abc PREHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table abc PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@abc POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table abc POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@abc PREHOOK: query: SELECT strct, strct.a, strct.b FROM abc LIMIT 10 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/create_udaf.q.out b/ql/src/test/results/clientpositive/create_udaf.q.out index 807a8bc..2e86a36 100644 --- a/ql/src/test/results/clientpositive/create_udaf.q.out +++ b/ql/src/test/results/clientpositive/create_udaf.q.out @@ -16,8 +16,10 @@ POSTHOOK: query: CREATE TEMPORARY FUNCTION test_max AS 'org.apache.hadoop.hive.q POSTHOOK: type: CREATEFUNCTION PREHOOK: query: CREATE TABLE dest1(col INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(col INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT test_max(length(src.value)) PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/create_union_table.q.out b/ql/src/test/results/clientpositive/create_union_table.q.out index 1f5b0a6..dc994f1 100644 --- a/ql/src/test/results/clientpositive/create_union_table.q.out +++ b/ql/src/test/results/clientpositive/create_union_table.q.out @@ -19,17 +19,21 @@ STAGE PLANS: PREHOOK: query: create table abc(mydata uniontype,struct>, strct struct) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table abc(mydata uniontype,struct>, strct struct) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@abc PREHOOK: query: load data local inpath '../../data/files/union_input.txt' overwrite into table abc PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@abc POSTHOOK: query: load data local inpath '../../data/files/union_input.txt' overwrite into table abc POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@abc PREHOOK: query: SELECT * FROM abc PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/create_view.q.out b/ql/src/test/results/clientpositive/create_view.q.out index 29ed662..ecc7618 100644 --- a/ql/src/test/results/clientpositive/create_view.q.out +++ b/ql/src/test/results/clientpositive/create_view.q.out @@ -383,8 +383,10 @@ View Original Text: SELECT upper(value) FROM src WHERE key=86 View Expanded Text: SELECT `_c0` AS `valoo` FROM (SELECT upper(`src`.`value`) FROM `default`.`src` WHERE `src`.`key`=86) `view3` PREHOOK: query: CREATE TABLE table1 (key int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table1 (key int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table1 PREHOOK: query: -- use DESCRIBE EXTENDED on a base table and an external table as points -- of comparison for view descriptions 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 f27d00f..ce9abcd 100644 --- a/ql/src/test/results/clientpositive/create_view_partitioned.q.out +++ b/ql/src/test/results/clientpositive/create_view_partitioned.q.out @@ -124,11 +124,13 @@ ADD PARTITION (value='val_86') PARTITION (value='val_xyz') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@src PREHOOK: Input: default@vp1 +PREHOOK: Output: default@vp1 POSTHOOK: query: ALTER VIEW vp1 ADD PARTITION (value='val_86') PARTITION (value='val_xyz') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@src POSTHOOK: Input: default@vp1 +POSTHOOK: Output: default@vp1 POSTHOOK: Output: default@vp1@value=val_86 POSTHOOK: Output: default@vp1@value=val_xyz PREHOOK: query: -- should work since we use IF NOT EXISTS @@ -137,12 +139,14 @@ ADD IF NOT EXISTS PARTITION (value='val_xyz') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@src PREHOOK: Input: default@vp1 +PREHOOK: Output: default@vp1 POSTHOOK: query: -- should work since we use IF NOT EXISTS ALTER VIEW vp1 ADD IF NOT EXISTS PARTITION (value='val_xyz') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@src POSTHOOK: Input: default@vp1 +POSTHOOK: Output: default@vp1 PREHOOK: query: SHOW PARTITIONS vp1 PREHOOK: type: SHOWPARTITIONS POSTHOOK: query: SHOW PARTITIONS vp1 @@ -283,6 +287,7 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 PREHOOK: Input: default@vp2 +PREHOOK: Output: default@vp2 POSTHOOK: query: ALTER VIEW vp2 ADD PARTITION (hr='11') PARTITION (hr='12') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@srcpart @@ -291,6 +296,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 POSTHOOK: Input: default@vp2 +POSTHOOK: Output: default@vp2 POSTHOOK: Output: default@vp2@hr=11 POSTHOOK: Output: default@vp2@hr=12 PREHOOK: query: SELECT key FROM vp2 WHERE hr='12' ORDER BY key @@ -391,11 +397,13 @@ ADD PARTITION (v='val_86') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@src PREHOOK: Input: default@vp3 +PREHOOK: Output: default@vp3 POSTHOOK: query: ALTER VIEW vp3 ADD PARTITION (v='val_86') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@src POSTHOOK: Input: default@vp3 +POSTHOOK: Output: default@vp3 POSTHOOK: Output: default@vp3@v=val_86 PREHOOK: query: DROP VIEW vp1 PREHOOK: type: DROPVIEW diff --git a/ql/src/test/results/clientpositive/create_view_translate.q.out b/ql/src/test/results/clientpositive/create_view_translate.q.out index f7243ff..7549eae 100644 --- a/ql/src/test/results/clientpositive/create_view_translate.q.out +++ b/ql/src/test/results/clientpositive/create_view_translate.q.out @@ -107,10 +107,12 @@ PREHOOK: query: -- HIVE-4116 Can't use views using map datatype. CREATE TABLE items (id INT, name STRING, info MAP) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-4116 Can't use views using map datatype. CREATE TABLE items (id INT, name STRING, info MAP) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@items PREHOOK: query: explain CREATE VIEW priceview AS SELECT items.id, items.info['price'] FROM items diff --git a/ql/src/test/results/clientpositive/ct_case_insensitive.q.out b/ql/src/test/results/clientpositive/ct_case_insensitive.q.out index 414427c..2bc28c8 100644 --- a/ql/src/test/results/clientpositive/ct_case_insensitive.q.out +++ b/ql/src/test/results/clientpositive/ct_case_insensitive.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE tmp_pyang_bucket3 (userId INT) CLUSTERED BY (userid) INTO 32 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp_pyang_bucket3 (userId INT) CLUSTERED BY (userid) INTO 32 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_pyang_bucket3 PREHOOK: query: DROP TABLE tmp_pyang_bucket3 PREHOOK: type: DROPTABLE @@ -13,6 +15,8 @@ POSTHOOK: Input: default@tmp_pyang_bucket3 POSTHOOK: Output: default@tmp_pyang_bucket3 PREHOOK: query: CREATE TABLE tmp_pyang_bucket3 (userId INT) CLUSTERED BY (userid) SORTED BY (USERID) INTO 32 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp_pyang_bucket3 (userId INT) CLUSTERED BY (userid) SORTED BY (USERID) INTO 32 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_pyang_bucket3 diff --git a/ql/src/test/results/clientpositive/ctas_char.q.out b/ql/src/test/results/clientpositive/ctas_char.q.out index 433a7ed..38874af 100644 --- a/ql/src/test/results/clientpositive/ctas_char.q.out +++ b/ql/src/test/results/clientpositive/ctas_char.q.out @@ -12,8 +12,10 @@ POSTHOOK: query: drop view ctas_char_3 POSTHOOK: type: DROPVIEW PREHOOK: query: create table ctas_char_1 (key char(10), value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ctas_char_1 (key char(10), value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ctas_char_1 PREHOOK: query: insert overwrite table ctas_char_1 select key, value from src sort by key, value limit 5 diff --git a/ql/src/test/results/clientpositive/ctas_date.q.out b/ql/src/test/results/clientpositive/ctas_date.q.out index c7a26c9..4ae5276 100644 --- a/ql/src/test/results/clientpositive/ctas_date.q.out +++ b/ql/src/test/results/clientpositive/ctas_date.q.out @@ -16,8 +16,10 @@ POSTHOOK: query: drop view ctas_date_4 POSTHOOK: type: DROPVIEW PREHOOK: query: create table ctas_date_1 (key int, value string, dd date) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ctas_date_1 (key int, value string, dd date) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ctas_date_1 PREHOOK: query: insert overwrite table ctas_date_1 select key, value, date '2012-01-01' from src sort by key, value limit 5 diff --git a/ql/src/test/results/clientpositive/ctas_hadoop20.q.out b/ql/src/test/results/clientpositive/ctas_hadoop20.q.out index 0ec0af5..2c0059d 100644 --- a/ql/src/test/results/clientpositive/ctas_hadoop20.q.out +++ b/ql/src/test/results/clientpositive/ctas_hadoop20.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) create table nzhang_Tmp(a int, b string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) create table nzhang_Tmp(a int, b string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_Tmp PREHOOK: query: select * from nzhang_Tmp PREHOOK: type: QUERY @@ -880,8 +882,10 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@nzhang_ctas5 PREHOOK: query: create table nzhang_ctas6 (key string, `to` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nzhang_ctas6 (key string, `to` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas6 PREHOOK: query: insert overwrite table nzhang_ctas6 select key, value from src limit 10 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out index 420dddb..024fa8b 100644 --- a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out +++ b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out @@ -5,6 +5,7 @@ PREHOOK: query: -- Tests that CTAS queries in non-default databases use the loca CREATE DATABASE db1 #### A masked pattern was here #### PREHOOK: type: CREATEDATABASE +#### A masked pattern was here #### POSTHOOK: query: -- Tests that CTAS queries in non-default databases use the location of the database -- not the hive.metastore.warehouse.dir for intermediate files (FileSinkOperator output). -- If hive.metastore.warehouse.dir were used this would fail because the scheme is invalid. @@ -12,6 +13,7 @@ POSTHOOK: query: -- Tests that CTAS queries in non-default databases use the loc CREATE DATABASE db1 #### A masked pattern was here #### POSTHOOK: type: CREATEDATABASE +#### A masked pattern was here #### PREHOOK: query: USE db1 PREHOOK: type: SWITCHDATABASE POSTHOOK: query: USE db1 diff --git a/ql/src/test/results/clientpositive/ctas_varchar.q.out b/ql/src/test/results/clientpositive/ctas_varchar.q.out index a11131d..2d179dd 100644 --- a/ql/src/test/results/clientpositive/ctas_varchar.q.out +++ b/ql/src/test/results/clientpositive/ctas_varchar.q.out @@ -12,8 +12,10 @@ POSTHOOK: query: drop view ctas_varchar_3 POSTHOOK: type: DROPVIEW PREHOOK: query: create table ctas_varchar_1 (key varchar(10), value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ctas_varchar_1 (key varchar(10), value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ctas_varchar_1 PREHOOK: query: insert overwrite table ctas_varchar_1 select key, value from src sort by key, value limit 5 diff --git a/ql/src/test/results/clientpositive/cte_2.q.out b/ql/src/test/results/clientpositive/cte_2.q.out index f4573b3..9161314 100644 --- a/ql/src/test/results/clientpositive/cte_2.q.out +++ b/ql/src/test/results/clientpositive/cte_2.q.out @@ -19,9 +19,11 @@ POSTHOOK: Input: default@src PREHOOK: query: -- insert test create table s1 like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- insert test create table s1 like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@s1 PREHOOK: query: with q1 as ( select key, value from src where key = '5') from q1 diff --git a/ql/src/test/results/clientpositive/custom_input_output_format.q.out b/ql/src/test/results/clientpositive/custom_input_output_format.q.out index 8f54c96..9dc6480 100644 --- a/ql/src/test/results/clientpositive/custom_input_output_format.q.out +++ b/ql/src/test/results/clientpositive/custom_input_output_format.q.out @@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE src1_rot13_iof(key STRING, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.udf.Rot13InputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.udf.Rot13OutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src1_rot13_iof(key STRING, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.udf.Rot13InputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.udf.Rot13OutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src1_rot13_iof PREHOOK: query: DESCRIBE EXTENDED src1_rot13_iof PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/database.q.out b/ql/src/test/results/clientpositive/database.q.out index 4bd94ff..cdaa405 100644 --- a/ql/src/test/results/clientpositive/database.q.out +++ b/ql/src/test/results/clientpositive/database.q.out @@ -122,9 +122,11 @@ test_db PREHOOK: query: -- CREATE table in non-default DB CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: -- CREATE table in non-default DB CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@test_table PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES @@ -150,9 +152,11 @@ col1 string None PREHOOK: query: -- CREATE LIKE in non-default DB CREATE TABLE test_table_like LIKE test_table PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: -- CREATE LIKE in non-default DB CREATE TABLE test_table_like LIKE test_table POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@test_table_like PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES @@ -171,11 +175,13 @@ PREHOOK: query: -- LOAD and SELECT LOAD DATA LOCAL INPATH '../../data/files/test.dat' OVERWRITE INTO TABLE test_table PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: test_db@test_table POSTHOOK: query: -- LOAD and SELECT LOAD DATA LOCAL INPATH '../../data/files/test.dat' OVERWRITE INTO TABLE test_table POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: test_db@test_table PREHOOK: query: SELECT * FROM test_table PREHOOK: type: QUERY @@ -208,8 +214,10 @@ POSTHOOK: type: SHOWTABLES test_table_like PREHOOK: query: CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@test_table PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES @@ -233,8 +241,10 @@ USE test_db POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE src (col1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: CREATE TABLE src (col1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@src PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES @@ -371,13 +381,17 @@ POSTHOOK: query: USE to_drop_db2 POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE temp_tbl (c STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:to_drop_db2 POSTHOOK: query: CREATE TABLE temp_tbl (c STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:to_drop_db2 POSTHOOK: Output: to_drop_db2@temp_tbl PREHOOK: query: CREATE TABLE temp_tbl2 LIKE temp_tbl PREHOOK: type: CREATETABLE +PREHOOK: Output: database:to_drop_db2 POSTHOOK: query: CREATE TABLE temp_tbl2 LIKE temp_tbl POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:to_drop_db2 POSTHOOK: Output: to_drop_db2@temp_tbl2 PREHOOK: query: INSERT OVERWRITE TABLE temp_tbl2 SELECT COUNT(*) FROM temp_tbl PREHOOK: type: QUERY @@ -429,8 +443,10 @@ POSTHOOK: type: SWITCHDATABASE POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ] PREHOOK: query: CREATE TABLE temp_tbl (c STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:to_drop_db3 POSTHOOK: query: CREATE TABLE temp_tbl (c STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:to_drop_db3 POSTHOOK: Output: to_drop_db3@temp_tbl POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ] PREHOOK: query: USE default @@ -524,21 +540,25 @@ PREHOOK: query: -- CREATE foreign table CREATE TABLE db1.src(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db1 POSTHOOK: query: -- CREATE foreign table CREATE TABLE db1.src(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db1 POSTHOOK: Output: db1@src POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ] PREHOOK: query: -- LOAD into foreign table LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE db1.src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db1@src POSTHOOK: query: -- LOAD into foreign table LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE db1.src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db1@src POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ] PREHOOK: query: -- SELECT from foreign table @@ -1057,11 +1077,13 @@ CREATE TABLE db1.srcpart(key STRING, value STRING) PARTITIONED BY (ds STRING, hr STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db1 POSTHOOK: query: -- CREATE Partitioned foreign table CREATE TABLE db1.srcpart(key STRING, value STRING) PARTITIONED BY (ds STRING, hr STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db1 POSTHOOK: Output: db1@srcpart POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ] PREHOOK: query: -- LOAD data into Partitioned foreign table @@ -1069,12 +1091,14 @@ LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE db1.srcpart PARTITION (ds='2008-04-08', hr='11') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db1@srcpart POSTHOOK: query: -- LOAD data into Partitioned foreign table LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE db1.srcpart PARTITION (ds='2008-04-08', hr='11') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db1@srcpart POSTHOOK: Output: db1@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ] @@ -1311,10 +1335,12 @@ PREHOOK: query: -- TABLESAMPLES CREATE TABLE bucketized_src (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- TABLESAMPLES CREATE TABLE bucketized_src (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketized_src POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ] PREHOOK: query: INSERT OVERWRITE TABLE bucketized_src @@ -1345,9 +1371,11 @@ POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ] PREHOOK: query: -- CREATE TABLE LIKE CREATE TABLE db2.src1 LIKE default.src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db2 POSTHOOK: query: -- CREATE TABLE LIKE CREATE TABLE db2.src1 LIKE default.src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db2 POSTHOOK: Output: db2@src1 POSTHOOK: Lineage: bucketized_src.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: bucketized_src.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/database_drop.q.out b/ql/src/test/results/clientpositive/database_drop.q.out index 86a21e4..3128561 100644 --- a/ql/src/test/results/clientpositive/database_drop.q.out +++ b/ql/src/test/results/clientpositive/database_drop.q.out @@ -28,15 +28,19 @@ POSTHOOK: type: SWITCHDATABASE PREHOOK: query: -- add a table, index and view CREATE TABLE temp_tbl (id INT, name STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db5 POSTHOOK: query: -- add a table, index and view CREATE TABLE temp_tbl (id INT, name STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db5 POSTHOOK: Output: db5@temp_tbl PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE temp_tbl PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db5@temp_tbl POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE temp_tbl POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db5@temp_tbl PREHOOK: query: CREATE VIEW temp_tbl_view AS SELECT * FROM temp_tbl PREHOOK: type: CREATEVIEW @@ -64,18 +68,24 @@ POSTHOOK: Lineage: db5__temp_tbl_idx1__.id SIMPLE [(temp_tbl)temp_tbl.FieldSchem PREHOOK: query: -- add a table, index and view with a different storage location #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:db5 POSTHOOK: query: -- add a table, index and view with a different storage location #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:db5 POSTHOOK: Output: db5@temp_tbl2 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), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' into table temp_tbl2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db5@temp_tbl2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' into table temp_tbl2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db5@temp_tbl2 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:), ] @@ -95,6 +105,7 @@ PREHOOK: type: CREATEINDEX #### A masked pattern was here #### POSTHOOK: type: CREATEINDEX POSTHOOK: Output: db5@db5__temp_tbl2_idx2__ +#### 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), ] @@ -115,9 +126,11 @@ POSTHOOK: Lineage: db5__temp_tbl_idx1__.id SIMPLE [(temp_tbl)temp_tbl.FieldSchem PREHOOK: query: -- add a partitioned table, index and view CREATE TABLE part_tab (id INT, name STRING) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db5 POSTHOOK: query: -- add a partitioned table, index and view CREATE TABLE part_tab (id INT, name STRING) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db5 POSTHOOK: Output: db5@part_tab POSTHOOK: Lineage: db5__temp_tbl2_idx2__._bucketname SIMPLE [(temp_tbl2)temp_tbl2.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: db5__temp_tbl2_idx2__._offsets EXPRESSION [(temp_tbl2)temp_tbl2.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ] @@ -127,9 +140,11 @@ 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: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db5@part_tab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db5@part_tab POSTHOOK: Output: db5@part_tab@ds=2008-04-09 POSTHOOK: Lineage: db5__temp_tbl2_idx2__._bucketname SIMPLE [(temp_tbl2)temp_tbl2.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] @@ -140,9 +155,11 @@ 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: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab PARTITION (ds='2009-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db5@part_tab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab PARTITION (ds='2009-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db5@part_tab POSTHOOK: Output: db5@part_tab@ds=2009-04-09 POSTHOOK: Lineage: db5__temp_tbl2_idx2__._bucketname SIMPLE [(temp_tbl2)temp_tbl2.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] @@ -207,10 +224,14 @@ PREHOOK: query: -- add a partitioned table, index and view with a different stor CREATE TABLE part_tab2 (id INT, name STRING) PARTITIONED BY (ds string) #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:db5 POSTHOOK: query: -- add a partitioned table, index and view with a different storage location CREATE TABLE part_tab2 (id INT, name STRING) PARTITIONED BY (ds string) #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:db5 POSTHOOK: Output: db5@part_tab2 POSTHOOK: Lineage: db5__part_tab_idx3__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab)part_tab.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: db5__part_tab_idx3__ PARTITION(ds=2008-04-09)._offsets EXPRESSION [(part_tab)part_tab.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ] @@ -226,9 +247,11 @@ 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: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab2 PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db5@part_tab2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab2 PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db5@part_tab2 POSTHOOK: Output: db5@part_tab2@ds=2008-04-09 POSTHOOK: Lineage: db5__part_tab_idx3__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab)part_tab.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] @@ -245,9 +268,11 @@ 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: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab2 PARTITION (ds='2009-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db5@part_tab2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab2 PARTITION (ds='2009-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db5@part_tab2 POSTHOOK: Output: db5@part_tab2@ds=2009-04-09 POSTHOOK: Lineage: db5__part_tab_idx3__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab)part_tab.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] @@ -265,10 +290,12 @@ POSTHOOK: Lineage: db5__temp_tbl_idx1__.id SIMPLE [(temp_tbl)temp_tbl.FieldSchem PREHOOK: query: CREATE INDEX idx4 ON TABLE part_tab2(id) AS 'COMPACT' with DEFERRED REBUILD #### A masked pattern was here #### PREHOOK: type: CREATEINDEX +#### A masked pattern was here #### POSTHOOK: query: CREATE INDEX idx4 ON TABLE part_tab2(id) AS 'COMPACT' with DEFERRED REBUILD #### A masked pattern was here #### POSTHOOK: type: CREATEINDEX POSTHOOK: Output: db5@db5__part_tab2_idx4__ +#### A masked pattern was here #### POSTHOOK: Lineage: db5__part_tab_idx3__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab)part_tab.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: db5__part_tab_idx3__ PARTITION(ds=2008-04-09)._offsets EXPRESSION [(part_tab)part_tab.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ] POSTHOOK: Lineage: db5__part_tab_idx3__ PARTITION(ds=2008-04-09).id SIMPLE [(part_tab)part_tab.FieldSchema(name:id, type:int, comment:null), ] @@ -338,10 +365,14 @@ PREHOOK: query: -- add a partitioned table, index and view with a different stor CREATE TABLE part_tab3 (id INT, name STRING) PARTITIONED BY (ds string) #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:db5 POSTHOOK: query: -- add a partitioned table, index and view with a different storage location CREATE TABLE part_tab3 (id INT, name STRING) PARTITIONED BY (ds string) #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:db5 POSTHOOK: Output: db5@part_tab3 POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab2)part_tab2.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._offsets EXPRESSION [(part_tab2)part_tab2.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ] @@ -363,10 +394,12 @@ 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), ] #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: db5@part_tab3 +#### A masked pattern was here #### +PREHOOK: Output: db5@part_tab3 #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: db5@part_tab3 +#### A masked pattern was here #### +POSTHOOK: Output: db5@part_tab3 POSTHOOK: Output: db5@part_tab3@ds=2007-04-09 POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab2)part_tab2.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._offsets EXPRESSION [(part_tab2)part_tab2.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ] @@ -388,9 +421,11 @@ 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: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab3 PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db5@part_tab3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab3 PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db5@part_tab3 POSTHOOK: Output: db5@part_tab3@ds=2008-04-09 POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab2)part_tab2.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] @@ -413,9 +448,11 @@ 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: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab3 PARTITION (ds='2009-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db5@part_tab3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab3 PARTITION (ds='2009-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db5@part_tab3 POSTHOOK: Output: db5@part_tab3@ds=2009-04-09 POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab2)part_tab2.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] @@ -439,10 +476,12 @@ POSTHOOK: Lineage: db5__temp_tbl_idx1__.id SIMPLE [(temp_tbl)temp_tbl.FieldSchem PREHOOK: query: CREATE INDEX idx5 ON TABLE part_tab3(id) AS 'COMPACT' with DEFERRED REBUILD #### A masked pattern was here #### PREHOOK: type: CREATEINDEX +#### A masked pattern was here #### POSTHOOK: query: CREATE INDEX idx5 ON TABLE part_tab3(id) AS 'COMPACT' with DEFERRED REBUILD #### A masked pattern was here #### POSTHOOK: type: CREATEINDEX POSTHOOK: Output: db5@db5__part_tab3_idx5__ +#### A masked pattern was here #### POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab2)part_tab2.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._offsets EXPRESSION [(part_tab2)part_tab2.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ] POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09).id SIMPLE [(part_tab2)part_tab2.FieldSchema(name:id, type:int, comment:null), ] @@ -533,6 +572,8 @@ CREATE EXTERNAL TABLE extab1(id INT, name STRING) ROW FORMAT STORED AS TEXTFILE #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:db5 POSTHOOK: query: -- add an external table CREATE EXTERNAL TABLE extab1(id INT, name STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '' @@ -540,6 +581,8 @@ CREATE EXTERNAL TABLE extab1(id INT, name STRING) ROW FORMAT STORED AS TEXTFILE #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:db5 POSTHOOK: Output: db5@extab1 POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._bucketname SIMPLE [(part_tab2)part_tab2.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: db5__part_tab2_idx4__ PARTITION(ds=2008-04-09)._offsets EXPRESSION [(part_tab2)part_tab2.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ] diff --git a/ql/src/test/results/clientpositive/database_location.q.out b/ql/src/test/results/clientpositive/database_location.q.out index bf0fbab..e829c63 100644 --- a/ql/src/test/results/clientpositive/database_location.q.out +++ b/ql/src/test/results/clientpositive/database_location.q.out @@ -13,8 +13,10 @@ POSTHOOK: query: USE db1 POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE table_db1 (name STRING, value INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db1 POSTHOOK: query: CREATE TABLE table_db1 (name STRING, value INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db1 POSTHOOK: Output: db1@table_db1 PREHOOK: query: DESCRIBE FORMATTED table_db1 PREHOOK: type: DESCTABLE @@ -54,10 +56,12 @@ PREHOOK: query: CREATE DATABASE db2 COMMENT 'database 2' #### A masked pattern was here #### PREHOOK: type: CREATEDATABASE +#### A masked pattern was here #### POSTHOOK: query: CREATE DATABASE db2 COMMENT 'database 2' #### A masked pattern was here #### POSTHOOK: type: CREATEDATABASE +#### A masked pattern was here #### PREHOOK: query: DESCRIBE DATABASE EXTENDED db2 PREHOOK: type: DESCDATABASE POSTHOOK: query: DESCRIBE DATABASE EXTENDED db2 @@ -69,8 +73,10 @@ POSTHOOK: query: USE db2 POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE table_db2 (name STRING, value INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db2 POSTHOOK: query: CREATE TABLE table_db2 (name STRING, value INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db2 POSTHOOK: Output: db2@table_db2 PREHOOK: query: DESCRIBE FORMATTED table_db2 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/date_1.q.out b/ql/src/test/results/clientpositive/date_1.q.out index d74abad..ffc6bba 100644 --- a/ql/src/test/results/clientpositive/date_1.q.out +++ b/ql/src/test/results/clientpositive/date_1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table date_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table date_1 (d date) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table date_1 (d date) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_1 PREHOOK: query: insert overwrite table date_1 select cast('2011-01-01' as date) from src tablesample (1 rows) diff --git a/ql/src/test/results/clientpositive/date_2.q.out b/ql/src/test/results/clientpositive/date_2.q.out index 0bbf0bb..e6ac753 100644 --- a/ql/src/test/results/clientpositive/date_2.q.out +++ b/ql/src/test/results/clientpositive/date_2.q.out @@ -10,6 +10,7 @@ PREHOOK: query: create table date_2 ( FL_NUM int ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table date_2 ( ORIGIN_CITY_NAME string, DEST_CITY_NAME string, @@ -18,12 +19,15 @@ POSTHOOK: query: create table date_2 ( FL_NUM int ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt.1' OVERWRITE INTO TABLE date_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@date_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt.1' OVERWRITE INTO TABLE date_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@date_2 PREHOOK: query: select fl_date, fl_num from date_2 order by fl_date asc, fl_num desc PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/date_3.q.out b/ql/src/test/results/clientpositive/date_3.q.out index 2d06b19..ed325bf 100644 --- a/ql/src/test/results/clientpositive/date_3.q.out +++ b/ql/src/test/results/clientpositive/date_3.q.out @@ -6,10 +6,12 @@ PREHOOK: query: create table date_3 ( c1 int ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table date_3 ( c1 int ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_3 PREHOOK: query: alter table date_3 add columns (c2 date) PREHOOK: type: ALTERTABLE_ADDCOLS diff --git a/ql/src/test/results/clientpositive/date_4.q.out b/ql/src/test/results/clientpositive/date_4.q.out index 25adf52..497935c 100644 --- a/ql/src/test/results/clientpositive/date_4.q.out +++ b/ql/src/test/results/clientpositive/date_4.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table date_4 POSTHOOK: type: DROPTABLE PREHOOK: query: create table date_4 (d date) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table date_4 (d date) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_4 PREHOOK: query: alter table date_4 set serde 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/date_join1.q.out b/ql/src/test/results/clientpositive/date_join1.q.out index cc45cf2..2086840 100644 --- a/ql/src/test/results/clientpositive/date_join1.q.out +++ b/ql/src/test/results/clientpositive/date_join1.q.out @@ -10,6 +10,7 @@ PREHOOK: query: create table date_join1 ( FL_NUM int ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table date_join1 ( ORIGIN_CITY_NAME string, DEST_CITY_NAME string, @@ -18,12 +19,15 @@ POSTHOOK: query: create table date_join1 ( FL_NUM int ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_join1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_join.txt' OVERWRITE INTO TABLE date_join1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@date_join1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_join.txt' OVERWRITE INTO TABLE date_join1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@date_join1 PREHOOK: query: -- Note that there are 2 rows with date 2000-11-28, so we should expect 4 rows with that date in the join results select t1.fl_num, t1.fl_date, t2.fl_num, t2.fl_date diff --git a/ql/src/test/results/clientpositive/date_serde.q.out b/ql/src/test/results/clientpositive/date_serde.q.out index 60f8919..24bfc2e 100644 --- a/ql/src/test/results/clientpositive/date_serde.q.out +++ b/ql/src/test/results/clientpositive/date_serde.q.out @@ -38,6 +38,7 @@ with serdeproperties ( ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- RegexSerDe -- @@ -54,12 +55,15 @@ with serdeproperties ( ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_serde_regex PREHOOK: query: load data local inpath '../../data/files/flights_tiny.txt.1' overwrite into table date_serde_regex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@date_serde_regex POSTHOOK: query: load data local inpath '../../data/files/flights_tiny.txt.1' overwrite into table date_serde_regex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@date_serde_regex PREHOOK: query: select * from date_serde_regex PREHOOK: type: QUERY @@ -234,6 +238,7 @@ create table date_serde_lb ( c2 int ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- LazyBinary -- @@ -242,6 +247,7 @@ create table date_serde_lb ( c2 int ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_serde_lb PREHOOK: query: alter table date_serde_lb set serde 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' PREHOOK: type: ALTERTABLE_SERIALIZER @@ -293,6 +299,7 @@ create table date_serde_ls ( c2 int ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- LazySimple -- @@ -301,6 +308,7 @@ create table date_serde_ls ( c2 int ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_serde_ls POSTHOOK: Lineage: date_serde_lb.c1 SIMPLE [(date_serde_regex)date_serde_regex.FieldSchema(name:fl_date, type:date, comment:from deserializer), ] POSTHOOK: Lineage: date_serde_lb.c2 SIMPLE [(date_serde_regex)date_serde_regex.FieldSchema(name:fl_num, type:int, comment:from deserializer), ] @@ -362,6 +370,7 @@ create table date_serde_c ( c2 int ) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- Columnar -- @@ -370,6 +379,7 @@ create table date_serde_c ( c2 int ) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_serde_c POSTHOOK: Lineage: date_serde_lb.c1 SIMPLE [(date_serde_regex)date_serde_regex.FieldSchema(name:fl_date, type:date, comment:from deserializer), ] POSTHOOK: Lineage: date_serde_lb.c2 SIMPLE [(date_serde_regex)date_serde_regex.FieldSchema(name:fl_num, type:int, comment:from deserializer), ] @@ -441,6 +451,7 @@ create table date_serde_lbc ( c2 int ) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- LazyBinaryColumnar -- @@ -449,6 +460,7 @@ create table date_serde_lbc ( c2 int ) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_serde_lbc POSTHOOK: Lineage: date_serde_c.c1 SIMPLE [(date_serde_ls)date_serde_ls.FieldSchema(name:c1, type:date, comment:from deserializer), ] POSTHOOK: Lineage: date_serde_c.c2 SIMPLE [(date_serde_ls)date_serde_ls.FieldSchema(name:c2, type:int, comment:from deserializer), ] @@ -530,6 +542,7 @@ create table date_serde_orc ( c2 int ) stored as orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- ORC -- @@ -538,6 +551,7 @@ create table date_serde_orc ( c2 int ) stored as orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_serde_orc POSTHOOK: Lineage: date_serde_c.c1 SIMPLE [(date_serde_ls)date_serde_ls.FieldSchema(name:c1, type:date, comment:from deserializer), ] POSTHOOK: Lineage: date_serde_c.c2 SIMPLE [(date_serde_ls)date_serde_ls.FieldSchema(name:c2, type:int, comment:from deserializer), ] diff --git a/ql/src/test/results/clientpositive/date_udf.q.out b/ql/src/test/results/clientpositive/date_udf.q.out index 28e4f08..71150ee 100644 --- a/ql/src/test/results/clientpositive/date_udf.q.out +++ b/ql/src/test/results/clientpositive/date_udf.q.out @@ -12,13 +12,17 @@ POSTHOOK: query: drop table date_udf_flight POSTHOOK: type: DROPTABLE PREHOOK: query: create table date_udf (d date) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table date_udf (d date) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_udf PREHOOK: query: create table date_udf_string (d string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table date_udf_string (d string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_udf_string PREHOOK: query: from src insert overwrite table date_udf @@ -48,6 +52,7 @@ PREHOOK: query: create table date_udf_flight ( FL_NUM int ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table date_udf_flight ( ORIGIN_CITY_NAME string, DEST_CITY_NAME string, @@ -56,14 +61,17 @@ POSTHOOK: query: create table date_udf_flight ( FL_NUM int ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@date_udf_flight POSTHOOK: Lineage: date_udf.d EXPRESSION [] POSTHOOK: Lineage: date_udf_string.d SIMPLE [] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt.1' OVERWRITE INTO TABLE date_udf_flight PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@date_udf_flight POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt.1' OVERWRITE INTO TABLE date_udf_flight POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@date_udf_flight POSTHOOK: Lineage: date_udf.d EXPRESSION [] POSTHOOK: Lineage: date_udf_string.d SIMPLE [] diff --git a/ql/src/test/results/clientpositive/ddltime.q.out b/ql/src/test/results/clientpositive/ddltime.q.out index ef9437e..5828d9f 100644 --- a/ql/src/test/results/clientpositive/ddltime.q.out +++ b/ql/src/test/results/clientpositive/ddltime.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table T1 like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table T1 like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: desc extended T1 PREHOOK: type: DESCTABLE @@ -85,8 +87,10 @@ value string default #### A masked pattern was here #### PREHOOK: query: create table if not exists T2 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists T2 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 POSTHOOK: Lineage: t1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: t1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/decimal_1.q.out b/ql/src/test/results/clientpositive/decimal_1.q.out index 4c296eb..edeebf3 100644 --- a/ql/src/test/results/clientpositive/decimal_1.q.out +++ b/ql/src/test/results/clientpositive/decimal_1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table if exists decimal_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table decimal_1 (t decimal(4,2), u decimal(5), v decimal) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table decimal_1 (t decimal(4,2), u decimal(5), v decimal) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@decimal_1 PREHOOK: query: alter table decimal_1 set serde 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/decimal_2.q.out b/ql/src/test/results/clientpositive/decimal_2.q.out index 28ee59d..0d9a90f 100644 --- a/ql/src/test/results/clientpositive/decimal_2.q.out +++ b/ql/src/test/results/clientpositive/decimal_2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table decimal_2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table decimal_2 (t decimal(18,9)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table decimal_2 (t decimal(18,9)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@decimal_2 PREHOOK: query: alter table decimal_2 set serde 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/decimal_3.q.out b/ql/src/test/results/clientpositive/decimal_3.q.out index 30b80c8..524fa62 100644 --- a/ql/src/test/results/clientpositive/decimal_3.q.out +++ b/ql/src/test/results/clientpositive/decimal_3.q.out @@ -7,17 +7,21 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_3(key decimal(38,18), value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@decimal_3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@decimal_3 PREHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key, value PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/decimal_4.q.out b/ql/src/test/results/clientpositive/decimal_4.q.out index 898b8ec..1a503ab 100644 --- a/ql/src/test/results/clientpositive/decimal_4.q.out +++ b/ql/src/test/results/clientpositive/decimal_4.q.out @@ -11,24 +11,30 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_4_1(key decimal(35,25), value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_4_1 PREHOOK: query: CREATE TABLE DECIMAL_4_2(key decimal(35,25), value decimal(35,25)) STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_4_2(key decimal(35,25), value decimal(35,25)) STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_4_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_4_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@decimal_4_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_4_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@decimal_4_1 PREHOOK: query: INSERT OVERWRITE TABLE DECIMAL_4_2 SELECT key, key * 3 FROM DECIMAL_4_1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/decimal_5.q.out b/ql/src/test/results/clientpositive/decimal_5.q.out index 77c3724..52dae22 100644 --- a/ql/src/test/results/clientpositive/decimal_5.q.out +++ b/ql/src/test/results/clientpositive/decimal_5.q.out @@ -7,17 +7,21 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_5(key decimal(10,5), value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_5 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@decimal_5 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@decimal_5 PREHOOK: query: SELECT key FROM DECIMAL_5 ORDER BY key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/decimal_6.q.out b/ql/src/test/results/clientpositive/decimal_6.q.out index ac83764..ddb630f 100644 --- a/ql/src/test/results/clientpositive/decimal_6.q.out +++ b/ql/src/test/results/clientpositive/decimal_6.q.out @@ -15,34 +15,42 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_6_1(key decimal(10,5), value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_6_1 PREHOOK: query: CREATE TABLE DECIMAL_6_2(key decimal(17,4), value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_6_2(key decimal(17,4), value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_6_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@decimal_6_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@decimal_6_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@decimal_6_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@decimal_6_2 PREHOOK: query: SELECT T.key from ( SELECT key, value from DECIMAL_6_1 diff --git a/ql/src/test/results/clientpositive/decimal_join.q.out b/ql/src/test/results/clientpositive/decimal_join.q.out index c47eefa..833ba5d 100644 --- a/ql/src/test/results/clientpositive/decimal_join.q.out +++ b/ql/src/test/results/clientpositive/decimal_join.q.out @@ -2,16 +2,20 @@ PREHOOK: query: -- HIVE-5292 Join on decimal columns fails create table src_dec (key decimal(3,0), value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-5292 Join on decimal columns fails create table src_dec (key decimal(3,0), value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_dec PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table src_dec PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_dec POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table src_dec POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_dec PREHOOK: query: select * from src_dec a join src_dec b on a.key=b.key+450 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/decimal_precision.q.out b/ql/src/test/results/clientpositive/decimal_precision.q.out index a80695c..06dcff4 100644 --- a/ql/src/test/results/clientpositive/decimal_precision.q.out +++ b/ql/src/test/results/clientpositive/decimal_precision.q.out @@ -7,17 +7,21 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal(20,10)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_PRECISION PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv8.txt' INTO TABLE DECIMAL_PRECISION PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@decimal_precision POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv8.txt' INTO TABLE DECIMAL_PRECISION POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@decimal_precision PREHOOK: query: SELECT * FROM DECIMAL_PRECISION ORDER BY dec PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/decimal_serde.q.out b/ql/src/test/results/clientpositive/decimal_serde.q.out index 9ab0b5e..8c4dd43 100644 --- a/ql/src/test/results/clientpositive/decimal_serde.q.out +++ b/ql/src/test/results/clientpositive/decimal_serde.q.out @@ -19,17 +19,21 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_TEXT (key decimal, value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_TEXT PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_TEXT PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@decimal_text POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_TEXT POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@decimal_text PREHOOK: query: SELECT * FROM DECIMAL_TEXT ORDER BY key, value PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/decimal_udf.q.out b/ql/src/test/results/clientpositive/decimal_udf.q.out index 74ae554..47b3698 100644 --- a/ql/src/test/results/clientpositive/decimal_udf.q.out +++ b/ql/src/test/results/clientpositive/decimal_udf.q.out @@ -7,17 +7,21 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DECIMAL_UDF (key decimal(20,10), value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_UDF PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_UDF PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@decimal_udf POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_UDF POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@decimal_udf PREHOOK: query: -- addition EXPLAIN SELECT key + key FROM DECIMAL_UDF diff --git a/ql/src/test/results/clientpositive/default_partition_name.q.out b/ql/src/test/results/clientpositive/default_partition_name.q.out index a2bbefc..109edcf 100644 --- a/ql/src/test/results/clientpositive/default_partition_name.q.out +++ b/ql/src/test/results/clientpositive/default_partition_name.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table default_partition_name (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table default_partition_name (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@default_partition_name PREHOOK: query: alter table default_partition_name add partition(ds='__HIVE_DEFAULT_PARTITION__') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@default_partition_name +PREHOOK: Output: default@default_partition_name POSTHOOK: query: alter table default_partition_name add partition(ds='__HIVE_DEFAULT_PARTITION__') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@default_partition_name +POSTHOOK: Output: default@default_partition_name POSTHOOK: Output: default@default_partition_name@ds=__HIVE_DEFAULT_PARTITION__ PREHOOK: query: show partitions default_partition_name PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/delimiter.q.out b/ql/src/test/results/clientpositive/delimiter.q.out index 5e84890..f3a61a9 100644 --- a/ql/src/test/results/clientpositive/delimiter.q.out +++ b/ql/src/test/results/clientpositive/delimiter.q.out @@ -4,18 +4,22 @@ fields terminated by '\t' lines terminated by '\n' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table impressions (imp string, msg string) row format delimited fields terminated by '\t' lines terminated by '\n' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@impressions PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in7.txt' INTO TABLE impressions PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@impressions POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in7.txt' INTO TABLE impressions POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@impressions PREHOOK: query: select * from impressions PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/describe_comment_indent.q.out b/ql/src/test/results/clientpositive/describe_comment_indent.q.out index 9542e01..c402a59 100644 --- a/ql/src/test/results/clientpositive/describe_comment_indent.q.out +++ b/ql/src/test/results/clientpositive/describe_comment_indent.q.out @@ -10,6 +10,7 @@ comment') COMMENT 'table comment two lines' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test comment indent processing for multi-line comments CREATE TABLE test_table( @@ -22,6 +23,7 @@ comment') COMMENT 'table comment two lines' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: DESCRIBE test_table PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out b/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out index b1bc745..12924a6 100644 --- a/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out +++ b/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- HIVE-2905 showing non-ascii comments create table dummy (col1 string, col2 string, col3 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-2905 showing non-ascii comments create table dummy (col1 string, col2 string, col3 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dummy PREHOOK: query: alter table dummy change col1 col1 string comment '한글_col1' PREHOOK: type: ALTERTABLE_RENAMECOL diff --git a/ql/src/test/results/clientpositive/describe_database_json.q.out b/ql/src/test/results/clientpositive/describe_database_json.q.out index 90bf871..cd33346 100644 --- a/ql/src/test/results/clientpositive/describe_database_json.q.out +++ b/ql/src/test/results/clientpositive/describe_database_json.q.out @@ -2,6 +2,7 @@ PREHOOK: type: CREATEDATABASE #### A masked pattern was here #### POSTHOOK: type: CREATEDATABASE +#### A masked pattern was here #### PREHOOK: query: DESCRIBE DATABASE jsondb1 PREHOOK: type: DESCDATABASE POSTHOOK: query: DESCRIBE DATABASE jsondb1 diff --git a/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out b/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out index 6327bbf..1dacca8 100644 --- a/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out +++ b/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out @@ -24,11 +24,13 @@ ADD PARTITION (value='val_86') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@src PREHOOK: Input: default@view_partitioned +PREHOOK: Output: default@view_partitioned POSTHOOK: query: ALTER VIEW view_partitioned ADD PARTITION (value='val_86') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@src POSTHOOK: Input: default@view_partitioned +POSTHOOK: Output: default@view_partitioned POSTHOOK: Output: default@view_partitioned@value=val_86 PREHOOK: query: DESCRIBE FORMATTED view_partitioned PARTITION (value='val_86') PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out b/ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out index 08075fe..7996c7d 100644 --- a/ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out +++ b/ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out @@ -24,11 +24,13 @@ ADD PARTITION (value='val_86') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@src PREHOOK: Input: default@view_partitioned +PREHOOK: Output: default@view_partitioned POSTHOOK: query: ALTER VIEW view_partitioned ADD PARTITION (value='val_86') POSTHOOK: type: ALTERTABLE_ADDPARTS POSTHOOK: Input: default@src POSTHOOK: Input: default@view_partitioned +POSTHOOK: Output: default@view_partitioned POSTHOOK: Output: default@view_partitioned@value=val_86 PREHOOK: query: DESCRIBE FORMATTED view_partitioned PARTITION (value='val_86') PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/describe_pretty.q.out b/ql/src/test/results/clientpositive/describe_pretty.q.out index d94dfe5..8765f66 100644 --- a/ql/src/test/results/clientpositive/describe_pretty.q.out +++ b/ql/src/test/results/clientpositive/describe_pretty.q.out @@ -16,6 +16,7 @@ adipiscing tortor. Integer venenatis', COMMENT 'table comment two lines' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test comment indent processing for multi-line comments CREATE TABLE test_table( @@ -34,6 +35,7 @@ adipiscing tortor. Integer venenatis', COMMENT 'table comment two lines' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: -- There will be an extra tab at the end of each comment line in the output. -- This is because DESCRIBE command separates the column, type and @@ -200,6 +202,7 @@ three lines comment', col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table_very_long_column_name( col1 INT COMMENT 'col1 one line comment', col2_abcdefghiklmnopqrstuvxyz STRING COMMENT 'col2 @@ -209,6 +212,7 @@ three lines comment', col4 STRING COMMENT 'col4 very long comment that is greater than 80 chars and is likely to spill into multiple lines') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table_very_long_column_name PREHOOK: query: DESCRIBE PRETTY test_table_very_long_column_name PREHOOK: type: DESCTABLE @@ -271,6 +275,7 @@ COMMENT 'table comment two lines' PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table_partitioned( col1 INT COMMENT 'col1 one line comment', col2 STRING COMMENT 'col2 @@ -288,6 +293,7 @@ COMMENT 'table comment two lines' PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table_partitioned PREHOOK: query: DESCRIBE PRETTY test_table_partitioned PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/describe_syntax.q.out b/ql/src/test/results/clientpositive/describe_syntax.q.out index 4fcb1ac..e4c4f96 100644 --- a/ql/src/test/results/clientpositive/describe_syntax.q.out +++ b/ql/src/test/results/clientpositive/describe_syntax.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: CREATE DATABASE db1 POSTHOOK: type: CREATEDATABASE PREHOOK: query: CREATE TABLE db1.t1(key1 INT, value1 STRING) PARTITIONED BY (ds STRING, part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db1 POSTHOOK: query: CREATE TABLE db1.t1(key1 INT, value1 STRING) PARTITIONED BY (ds STRING, part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db1 POSTHOOK: Output: db1@t1 PREHOOK: query: use db1 PREHOOK: type: SWITCHDATABASE @@ -13,24 +15,24 @@ POSTHOOK: query: use db1 POSTHOOK: type: SWITCHDATABASE PREHOOK: query: ALTER TABLE t1 ADD PARTITION (ds='3', part='3') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: db1@t1 +PREHOOK: Output: db1@t1 POSTHOOK: query: ALTER TABLE t1 ADD PARTITION (ds='3', part='3') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: db1@t1 +POSTHOOK: Output: db1@t1 POSTHOOK: Output: db1@t1@ds=3/part=3 PREHOOK: query: ALTER TABLE t1 ADD PARTITION (ds='4', part='4') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: db1@t1 +PREHOOK: Output: db1@t1 POSTHOOK: query: ALTER TABLE t1 ADD PARTITION (ds='4', part='4') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: db1@t1 +POSTHOOK: Output: db1@t1 POSTHOOK: Output: db1@t1@ds=4/part=4 PREHOOK: query: ALTER TABLE t1 ADD PARTITION (ds='4', part='5') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: db1@t1 +PREHOOK: Output: db1@t1 POSTHOOK: query: ALTER TABLE t1 ADD PARTITION (ds='4', part='5') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: db1@t1 +POSTHOOK: Output: db1@t1 POSTHOOK: Output: db1@t1@ds=4/part=5 PREHOOK: query: -- describe table DESCRIBE t1 diff --git a/ql/src/test/results/clientpositive/describe_table.q.out b/ql/src/test/results/clientpositive/describe_table.q.out index 17e1764..e907248 100644 --- a/ql/src/test/results/clientpositive/describe_table.q.out +++ b/ql/src/test/results/clientpositive/describe_table.q.out @@ -152,8 +152,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: create table srcpart_serdeprops like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart_serdeprops like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_serdeprops PREHOOK: query: alter table srcpart_serdeprops set serdeproperties('xyz'='0') PREHOOK: type: ALTERTABLE_SERDEPROPERTIES diff --git a/ql/src/test/results/clientpositive/describe_table_json.q.out b/ql/src/test/results/clientpositive/describe_table_json.q.out index 31225f2..897f91b 100644 --- a/ql/src/test/results/clientpositive/describe_table_json.q.out +++ b/ql/src/test/results/clientpositive/describe_table_json.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE IF NOT EXISTS jsontable (key INT, value STRING) COMMENT 'json table' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE IF NOT EXISTS jsontable (key INT, value STRING) COMMENT 'json table' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@jsontable PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES diff --git a/ql/src/test/results/clientpositive/diff_part_input_formats.q.out b/ql/src/test/results/clientpositive/diff_part_input_formats.q.out index 474023b..695ebca 100644 --- a/ql/src/test/results/clientpositive/diff_part_input_formats.q.out +++ b/ql/src/test/results/clientpositive/diff_part_input_formats.q.out @@ -3,18 +3,20 @@ PREHOOK: query: -- Tests the case where a table is changed from sequence file to -- selected, then it should still use RC file for reading the dummy partition. CREATE TABLE part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests the case where a table is changed from sequence file to a RC file, -- resulting in partitions in both file formats. If no valid partitions are -- selected, then it should still use RC file for reading the dummy partition. CREATE TABLE part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_test PREHOOK: query: ALTER TABLE part_test ADD PARTITION(ds='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@part_test +PREHOOK: Output: default@part_test POSTHOOK: query: ALTER TABLE part_test ADD PARTITION(ds='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@part_test +POSTHOOK: Output: default@part_test POSTHOOK: Output: default@part_test@ds=1 PREHOOK: query: ALTER TABLE part_test SET FILEFORMAT RCFILE PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -26,10 +28,10 @@ POSTHOOK: Input: default@part_test POSTHOOK: Output: default@part_test PREHOOK: query: ALTER TABLE part_test ADD PARTITION(ds='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@part_test +PREHOOK: Output: default@part_test POSTHOOK: query: ALTER TABLE part_test ADD PARTITION(ds='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@part_test +POSTHOOK: Output: default@part_test POSTHOOK: Output: default@part_test@ds=2 PREHOOK: query: SELECT count(1) FROM part_test WHERE ds='3' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/disable_file_format_check.q.out b/ql/src/test/results/clientpositive/disable_file_format_check.q.out index 8182dfb..95f662d 100644 --- a/ql/src/test/results/clientpositive/disable_file_format_check.q.out +++ b/ql/src/test/results/clientpositive/disable_file_format_check.q.out @@ -1,22 +1,30 @@ PREHOOK: query: create table kv_fileformat_check_txt (key string, value string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table kv_fileformat_check_txt (key string, value string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@kv_fileformat_check_txt PREHOOK: query: load data local inpath '../../data/files/kv1.seq' overwrite into table kv_fileformat_check_txt PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@kv_fileformat_check_txt POSTHOOK: query: load data local inpath '../../data/files/kv1.seq' overwrite into table kv_fileformat_check_txt POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@kv_fileformat_check_txt PREHOOK: query: create table kv_fileformat_check_seq (key string, value string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table kv_fileformat_check_seq (key string, value string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@kv_fileformat_check_seq PREHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table kv_fileformat_check_seq PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@kv_fileformat_check_seq POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table kv_fileformat_check_seq POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@kv_fileformat_check_seq diff --git a/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out b/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out index 7265313..ddccb58 100644 --- a/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out +++ b/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE bucket2_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket2_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket2_1 PREHOOK: query: explain extended insert overwrite table bucket2_1 diff --git a/ql/src/test/results/clientpositive/disallow_incompatible_type_change_off.q.out b/ql/src/test/results/clientpositive/disallow_incompatible_type_change_off.q.out index 9b4f307..88800cb 100644 --- a/ql/src/test/results/clientpositive/disallow_incompatible_type_change_off.q.out +++ b/ql/src/test/results/clientpositive/disallow_incompatible_type_change_off.q.out @@ -9,8 +9,10 @@ POSTHOOK: Input: default@src 238 val_238 PREHOOK: query: CREATE TABLE test_table123 (a INT, b MAP) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table123 (a INT, b MAP) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table123 PREHOOK: query: INSERT OVERWRITE TABLE test_table123 PARTITION(ds="foo1") SELECT 1, MAP("a1", "b1") FROM src tablesample (1 rows) PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/drop_database_removes_partition_dirs.q.out b/ql/src/test/results/clientpositive/drop_database_removes_partition_dirs.q.out index 42c7ab3..475d3d0 100644 --- a/ql/src/test/results/clientpositive/drop_database_removes_partition_dirs.q.out +++ b/ql/src/test/results/clientpositive/drop_database_removes_partition_dirs.q.out @@ -17,20 +17,26 @@ PARTITIONED BY (part STRING) STORED AS RCFILE #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:test_database POSTHOOK: query: CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:test_database POSTHOOK: Output: test_database@test_table PREHOOK: query: ALTER TABLE test_table ADD PARTITION (part = '1') #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: test_database@test_table +#### A masked pattern was here #### +PREHOOK: Output: test_database@test_table POSTHOOK: query: ALTER TABLE test_table ADD PARTITION (part = '1') #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: test_database@test_table +#### A masked pattern was here #### +POSTHOOK: Output: test_database@test_table POSTHOOK: Output: test_database@test_table@part=1 PREHOOK: query: INSERT OVERWRITE TABLE test_table PARTITION (part = '1') SELECT * FROM default.src diff --git a/ql/src/test/results/clientpositive/drop_index_removes_partition_dirs.q.out b/ql/src/test/results/clientpositive/drop_index_removes_partition_dirs.q.out index 2bb0e22..d085758 100644 --- a/ql/src/test/results/clientpositive/drop_index_removes_partition_dirs.q.out +++ b/ql/src/test/results/clientpositive/drop_index_removes_partition_dirs.q.out @@ -6,6 +6,8 @@ PARTITIONED BY (part STRING) STORED AS RCFILE #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that if a partition exists outside an index table's current location when the -- index is dropped the partition's location is dropped as well. @@ -14,6 +16,8 @@ PARTITIONED BY (part STRING) STORED AS RCFILE #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: CREATE INDEX test_index ON TABLE test_table(key) AS 'compact' WITH DEFERRED REBUILD @@ -27,11 +31,13 @@ POSTHOOK: Output: default@test_index_table PREHOOK: query: ALTER TABLE test_index_table ADD PARTITION (part = '1') #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test_index_table +#### A masked pattern was here #### +PREHOOK: Output: default@test_index_table POSTHOOK: query: ALTER TABLE test_index_table ADD PARTITION (part = '1') #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test_index_table +#### A masked pattern was here #### +POSTHOOK: Output: default@test_index_table POSTHOOK: Output: default@test_index_table@part=1 Found 1 items #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/drop_multi_partitions.q.out b/ql/src/test/results/clientpositive/drop_multi_partitions.q.out index 00d4b6d..735920b 100644 --- a/ql/src/test/results/clientpositive/drop_multi_partitions.q.out +++ b/ql/src/test/results/clientpositive/drop_multi_partitions.q.out @@ -1,28 +1,30 @@ PREHOOK: query: create table mp (a string) partitioned by (b string, c string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table mp (a string) partitioned by (b string, c string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mp PREHOOK: query: alter table mp add partition (b='1', c='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mp +PREHOOK: Output: default@mp POSTHOOK: query: alter table mp add partition (b='1', c='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mp +POSTHOOK: Output: default@mp POSTHOOK: Output: default@mp@b=1/c=1 PREHOOK: query: alter table mp add partition (b='1', c='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mp +PREHOOK: Output: default@mp POSTHOOK: query: alter table mp add partition (b='1', c='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mp +POSTHOOK: Output: default@mp POSTHOOK: Output: default@mp@b=1/c=2 PREHOOK: query: alter table mp add partition (b='2', c='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mp +PREHOOK: Output: default@mp POSTHOOK: query: alter table mp add partition (b='2', c='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mp +POSTHOOK: Output: default@mp POSTHOOK: Output: default@mp@b=2/c=2 PREHOOK: query: show partitions mp PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter.q.out b/ql/src/test/results/clientpositive/drop_partitions_filter.q.out index b3ee582..b77972c 100644 --- a/ql/src/test/results/clientpositive/drop_partitions_filter.q.out +++ b/ql/src/test/results/clientpositive/drop_partitions_filter.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table ptestfilter (a string, b int) partitioned by (c string, d string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ptestfilter (a string, b int) partitioned by (c string, d string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ptestfilter PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE @@ -19,66 +21,66 @@ c string None d string None PREHOOK: query: alter table ptestfilter add partition (c='US', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='US', d=1) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=US/d=1 PREHOOK: query: alter table ptestfilter add partition (c='US', d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='US', d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=US/d=2 PREHOOK: query: alter table ptestFilter add partition (c='Uganda', d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestFilter add partition (c='Uganda', d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=Uganda/d=2 PREHOOK: query: alter table ptestfilter add partition (c='Germany', d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='Germany', d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=Germany/d=2 PREHOOK: query: alter table ptestfilter add partition (c='Canada', d=3) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='Canada', d=3) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=Canada/d=3 PREHOOK: query: alter table ptestfilter add partition (c='Russia', d=3) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='Russia', d=3) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=Russia/d=3 PREHOOK: query: alter table ptestfilter add partition (c='Greece', d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='Greece', d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=Greece/d=2 PREHOOK: query: alter table ptestfilter add partition (c='India', d=3) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='India', d=3) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=India/d=3 PREHOOK: query: alter table ptestfilter add partition (c='France', d=4) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='France', d=4) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=France/d=4 PREHOOK: query: show partitions ptestfilter PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out b/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out index 0225c3b..ce32a93 100644 --- a/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out +++ b/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table ptestfilter (a string, b int) partitioned by (c int, d int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ptestfilter (a string, b int) partitioned by (c int, d int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ptestfilter PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE @@ -19,45 +21,45 @@ c int None d int None PREHOOK: query: alter table ptestfilter add partition (c=1, d=1) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c=1, d=1) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=1/d=1 PREHOOK: query: alter table ptestfilter add partition (c=1, d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c=1, d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=1/d=2 PREHOOK: query: alter table ptestFilter add partition (c=2, d=1) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestFilter add partition (c=2, d=1) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=2/d=1 PREHOOK: query: alter table ptestfilter add partition (c=2, d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c=2, d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=2/d=2 PREHOOK: query: alter table ptestfilter add partition (c=3, d=1) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c=3, d=1) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=3/d=1 PREHOOK: query: alter table ptestfilter add partition (c=3, d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c=3, d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=3/d=2 PREHOOK: query: show partitions ptestfilter PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out b/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out index 30bb316..c36cb72 100644 --- a/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out +++ b/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table ptestfilter (a string, b int) partitioned by (c string, d int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ptestfilter (a string, b int) partitioned by (c string, d int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ptestfilter PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE @@ -19,45 +21,45 @@ c string None d int None PREHOOK: query: alter table ptestfilter add partition (c='1', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='1', d=1) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=1/d=1 PREHOOK: query: alter table ptestfilter add partition (c='1', d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='1', d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=1/d=2 PREHOOK: query: alter table ptestFilter add partition (c='2', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestFilter add partition (c='2', d=1) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=2/d=1 PREHOOK: query: alter table ptestfilter add partition (c='2', d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='2', d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=2/d=2 PREHOOK: query: alter table ptestfilter add partition (c='3', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='3', d=1) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=3/d=1 PREHOOK: query: alter table ptestfilter add partition (c='3', d=2) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ptestfilter +PREHOOK: Output: default@ptestfilter POSTHOOK: query: alter table ptestfilter add partition (c='3', d=2) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ptestfilter +POSTHOOK: Output: default@ptestfilter POSTHOOK: Output: default@ptestfilter@c=3/d=2 PREHOOK: query: show partitions ptestfilter PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out b/ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out index cf44ebd..e567136 100644 --- a/ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out +++ b/ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table tbl_protectmode_no_drop (c1 string,c2 string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_protectmode_no_drop (c1 string,c2 string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_protectmode_no_drop PREHOOK: query: alter table tbl_protectmode_no_drop add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl_protectmode_no_drop +PREHOOK: Output: default@tbl_protectmode_no_drop POSTHOOK: query: alter table tbl_protectmode_no_drop add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl_protectmode_no_drop +POSTHOOK: Output: default@tbl_protectmode_no_drop POSTHOOK: Output: default@tbl_protectmode_no_drop@p=p1 PREHOOK: query: alter table tbl_protectmode_no_drop partition (p='p1') enable no_drop PREHOOK: type: ALTERPARTITION_PROTECTMODE diff --git a/ql/src/test/results/clientpositive/drop_table2.q.out b/ql/src/test/results/clientpositive/drop_table2.q.out index b7588fa..c37326a 100644 --- a/ql/src/test/results/clientpositive/drop_table2.q.out +++ b/ql/src/test/results/clientpositive/drop_table2.q.out @@ -1,28 +1,30 @@ PREHOOK: query: create table if not exists temp(col STRING) partitioned by (p STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists temp(col STRING) partitioned by (p STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@temp PREHOOK: query: alter table temp add if not exists partition (p ='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@temp +PREHOOK: Output: default@temp POSTHOOK: query: alter table temp add if not exists partition (p ='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@temp +POSTHOOK: Output: default@temp POSTHOOK: Output: default@temp@p=p1 PREHOOK: query: alter table temp add if not exists partition (p ='p2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@temp +PREHOOK: Output: default@temp POSTHOOK: query: alter table temp add if not exists partition (p ='p2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@temp +POSTHOOK: Output: default@temp POSTHOOK: Output: default@temp@p=p2 PREHOOK: query: alter table temp add if not exists partition (p ='p3') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@temp +PREHOOK: Output: default@temp POSTHOOK: query: alter table temp add if not exists partition (p ='p3') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@temp +POSTHOOK: Output: default@temp POSTHOOK: Output: default@temp@p=p3 PREHOOK: query: show partitions temp PREHOOK: type: SHOWPARTITIONS @@ -41,8 +43,10 @@ POSTHOOK: Input: default@temp POSTHOOK: Output: default@temp PREHOOK: query: create table if not exists temp(col STRING) partitioned by (p STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists temp(col STRING) partitioned by (p STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@temp PREHOOK: query: show partitions temp PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/drop_table_removes_partition_dirs.q.out b/ql/src/test/results/clientpositive/drop_table_removes_partition_dirs.q.out index 6cc545b..2cf0d89 100644 --- a/ql/src/test/results/clientpositive/drop_table_removes_partition_dirs.q.out +++ b/ql/src/test/results/clientpositive/drop_table_removes_partition_dirs.q.out @@ -6,6 +6,8 @@ PARTITIONED BY (part STRING) STORED AS RCFILE #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that if a partition exists outside the table's current location when the -- table is dropped the partition's location is dropped as well. @@ -14,15 +16,19 @@ PARTITIONED BY (part STRING) STORED AS RCFILE #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: ALTER TABLE test_table ADD PARTITION (part = '1') #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test_table +#### A masked pattern was here #### +PREHOOK: Output: default@test_table POSTHOOK: query: ALTER TABLE test_table ADD PARTITION (part = '1') #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test_table +#### A masked pattern was here #### +POSTHOOK: Output: default@test_table POSTHOOK: Output: default@test_table@part=1 PREHOOK: query: INSERT OVERWRITE TABLE test_table PARTITION (part = '1') SELECT * FROM src diff --git a/ql/src/test/results/clientpositive/drop_with_concurrency.q.out b/ql/src/test/results/clientpositive/drop_with_concurrency.q.out index 42aad9a..a81b2bd 100644 --- a/ql/src/test/results/clientpositive/drop_with_concurrency.q.out +++ b/ql/src/test/results/clientpositive/drop_with_concurrency.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table if exists drop_with_concurrency_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table drop_with_concurrency_1 (c1 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table drop_with_concurrency_1 (c1 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@drop_with_concurrency_1 PREHOOK: query: drop table drop_with_concurrency_1 PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out b/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out index 545d527..7c0183b 100644 --- a/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out +++ b/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table dynamic_part_table(intcol string) partitioned by (partcol1 string, partcol2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dynamic_part_table(intcol string) partitioned by (partcol1 string, partcol2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dynamic_part_table PREHOOK: query: insert into table dynamic_part_table partition(partcol1, partcol2) select '1', '1', '1' from src where key=150 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/enforce_order.q.out b/ql/src/test/results/clientpositive/enforce_order.q.out index e870837..c14d3c9 100644 --- a/ql/src/test/results/clientpositive/enforce_order.q.out +++ b/ql/src/test/results/clientpositive/enforce_order.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: drop table table_desc POSTHOOK: type: DROPTABLE PREHOOK: query: create table table_asc(key string, value string) clustered by (key) sorted by (key ASC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_asc(key string, value string) clustered by (key) sorted by (key ASC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_asc PREHOOK: query: create table table_desc(key string, value string) clustered by (key) sorted by (key DESC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc(key string, value string) clustered by (key) sorted by (key DESC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc PREHOOK: query: insert overwrite table table_asc select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/escape1.q.out b/ql/src/test/results/clientpositive/escape1.q.out index 48ac8d4..84446c4 100644 --- a/ql/src/test/results/clientpositive/escape1.q.out +++ b/ql/src/test/results/clientpositive/escape1.q.out @@ -14,14 +14,18 @@ POSTHOOK: query: DROP TABLE escape_raw POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE escape_raw (s STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE escape_raw (s STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@escape_raw PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/escapetest.txt' INTO TABLE escape_raw PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@escape_raw POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/escapetest.txt' INTO TABLE escape_raw POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@escape_raw PREHOOK: query: SELECT count(*) from escape_raw PREHOOK: type: QUERY @@ -170,8 +174,10 @@ z ~ PREHOOK: query: CREATE TABLE escape1 (a STRING) PARTITIONED BY (ds STRING, part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE escape1 (a STRING) PARTITIONED BY (ds STRING, part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@escape1 PREHOOK: query: INSERT OVERWRITE TABLE escape1 PARTITION (ds='1', part) SELECT '1', s from escape_raw diff --git a/ql/src/test/results/clientpositive/escape2.q.out b/ql/src/test/results/clientpositive/escape2.q.out index a554ceb..aa9f601 100644 --- a/ql/src/test/results/clientpositive/escape2.q.out +++ b/ql/src/test/results/clientpositive/escape2.q.out @@ -14,14 +14,18 @@ POSTHOOK: query: DROP TABLE IF EXISTS escape_raw POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE escape_raw (s STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE escape_raw (s STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@escape_raw PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/escapetest.txt' INTO TABLE escape_raw PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@escape_raw POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/escapetest.txt' INTO TABLE escape_raw POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@escape_raw PREHOOK: query: SELECT count(*) from escape_raw PREHOOK: type: QUERY @@ -170,8 +174,10 @@ z ~ PREHOOK: query: CREATE TABLE escape2(a STRING) PARTITIONED BY (ds STRING, part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE escape2(a STRING) PARTITIONED BY (ds STRING, part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@escape2 PREHOOK: query: INSERT OVERWRITE TABLE escape2 PARTITION (ds='1', part) SELECT '1', s from escape_raw diff --git a/ql/src/test/results/clientpositive/exchange_partition.q.out b/ql/src/test/results/clientpositive/exchange_partition.q.out index bbc6d5b..b1aa334 100644 --- a/ql/src/test/results/clientpositive/exchange_partition.q.out +++ b/ql/src/test/results/clientpositive/exchange_partition.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS @@ -18,10 +22,10 @@ POSTHOOK: query: SHOW PARTITIONS exchange_part_test2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/exchange_partition2.q.out b/ql/src/test/results/clientpositive/exchange_partition2.q.out index 5136106..66d8b77 100644 --- a/ql/src/test/results/clientpositive/exchange_partition2.q.out +++ b/ql/src/test/results/clientpositive/exchange_partition2.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS @@ -18,10 +22,10 @@ POSTHOOK: query: SHOW PARTITIONS exchange_part_test2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=1 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/exchange_partition3.q.out b/ql/src/test/results/clientpositive/exchange_partition3.q.out index 72ac6bd..c9eb50c 100644 --- a/ql/src/test/results/clientpositive/exchange_partition3.q.out +++ b/ql/src/test/results/clientpositive/exchange_partition3.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test1 PREHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exchange_part_test2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS @@ -18,17 +22,17 @@ POSTHOOK: query: SHOW PARTITIONS exchange_part_test2 POSTHOOK: type: SHOWPARTITIONS PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=1 PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exchange_part_test1 +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exchange_part_test1 +POSTHOOK: Output: default@exchange_part_test1 POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=2 PREHOOK: query: SHOW PARTITIONS exchange_part_test1 PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out b/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out index 388efa4..11e2380 100644 --- a/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out +++ b/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out @@ -2,10 +2,12 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' diff --git a/ql/src/test/results/clientpositive/exim_01_nonpart.q.out b/ql/src/test/results/clientpositive/exim_01_nonpart.q.out index 0b2a1f8..0abab9f 100644 --- a/ql/src/test/results/clientpositive/exim_01_nonpart.q.out +++ b/ql/src/test/results/clientpositive/exim_01_nonpart.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' diff --git a/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out b/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out index 99d8a40..8712de0 100644 --- a/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out +++ b/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out @@ -4,12 +4,14 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee #### A masked pattern was here #### PREHOOK: query: export table exim_employee to 'ql/test/data/exports/exim_employee' diff --git a/ql/src/test/results/clientpositive/exim_02_part.q.out b/ql/src/test/results/clientpositive/exim_02_part.q.out index 751cea4..c368476 100644 --- a/ql/src/test/results/clientpositive/exim_02_part.q.out +++ b/ql/src/test/results/clientpositive/exim_02_part.q.out @@ -4,20 +4,24 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out b/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out index 042a49c..f1586ae 100644 --- a/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out +++ b/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -42,10 +46,12 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("maker"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department identifier") stored as textfile tblproperties("maker"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department PREHOOK: query: import from 'ql/test/data/exports/exim_department' PREHOOK: type: IMPORT diff --git a/ql/src/test/results/clientpositive/exim_04_all_part.q.out b/ql/src/test/results/clientpositive/exim_04_all_part.q.out index f3fbe64..cae3d29 100644 --- a/ql/src/test/results/clientpositive/exim_04_all_part.q.out +++ b/ql/src/test/results/clientpositive/exim_04_all_part.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out b/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out index 62663eb..8623f4b 100644 --- a/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out +++ b/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out @@ -5,6 +5,7 @@ PREHOOK: query: create table exim_employee (emp_id int comment 'employee id', em row format serde "org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe" with serdeproperties ('serialization.format'='1') stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee (emp_id int comment 'employee id', emp_name string, emp_dob string comment 'employee date of birth', emp_sex string comment 'M/F') comment 'employee table' partitioned by (emp_country string comment '2-char code', emp_state string comment '2-char code') @@ -12,6 +13,7 @@ POSTHOOK: query: create table exim_employee (emp_id int comment 'employee id', e row format serde "org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe" with serdeproperties ('serialization.format'='1') stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: alter table exim_employee add columns (emp_dept int) PREHOOK: type: ALTERTABLE_ADDCOLS @@ -31,10 +33,10 @@ POSTHOOK: Input: default@exim_employee POSTHOOK: Output: default@exim_employee PREHOOK: query: alter table exim_employee add partition (emp_country='in', emp_state='tn') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exim_employee +PREHOOK: Output: default@exim_employee POSTHOOK: query: alter table exim_employee add partition (emp_country='in', emp_state='tn') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exim_employee +POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: alter table exim_employee set serde "org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe" with serdeproperties ('serialization.format'='2') PREHOOK: type: ALTERTABLE_SERIALIZER @@ -58,10 +60,10 @@ POSTHOOK: Input: default@exim_employee POSTHOOK: Output: default@exim_employee PREHOOK: query: alter table exim_employee add partition (emp_country='in', emp_state='ka') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@exim_employee +PREHOOK: Output: default@exim_employee POSTHOOK: query: alter table exim_employee add partition (emp_country='in', emp_state='ka') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@exim_employee +POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka #### A masked pattern was here #### PREHOOK: query: export table exim_employee to 'ql/test/data/exports/exim_employee' diff --git a/ql/src/test/results/clientpositive/exim_05_some_part.q.out b/ql/src/test/results/clientpositive/exim_05_some_part.q.out index fe251e6..d790d18 100644 --- a/ql/src/test/results/clientpositive/exim_05_some_part.q.out +++ b/ql/src/test/results/clientpositive/exim_05_some_part.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/exim_06_one_part.q.out b/ql/src/test/results/clientpositive/exim_06_one_part.q.out index 15c6c2c..1d7b432 100644 --- a/ql/src/test/results/clientpositive/exim_06_one_part.q.out +++ b/ql/src/test/results/clientpositive/exim_06_one_part.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out b/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out index 71b8e97..60b1cd0 100644 --- a/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out +++ b/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### @@ -84,20 +94,24 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("maker"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "table of employees" partitioned by (emp_country string comment "iso code", emp_state string comment "free-form text") stored as textfile tblproperties("maker"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="al") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: importer@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="al") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: importer@exim_employee POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=al PREHOOK: query: import from 'ql/test/data/exports/exim_employee' diff --git a/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out b/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out index eca4d9e..90f8d8d 100644 --- a/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out +++ b/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -43,17 +47,21 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (emp_org string) stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department partition (emp_org="hr") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: importer@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department partition (emp_org="hr") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: importer@exim_department POSTHOOK: Output: importer@exim_department@emp_org=hr PREHOOK: query: import table exim_imported_dept from 'ql/test/data/exports/exim_department' diff --git a/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out b/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out index fa2ac45..6f9feb0 100644 --- a/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out +++ b/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### @@ -84,29 +94,35 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: importer@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: importer@exim_employee POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: importer@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: importer@exim_employee POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn") from 'ql/test/data/exports/exim_employee' diff --git a/ql/src/test/results/clientpositive/exim_10_external_managed.q.out b/ql/src/test/results/clientpositive/exim_10_external_managed.q.out index 551b033..e7fbd69 100644 --- a/ql/src/test/results/clientpositive/exim_10_external_managed.q.out +++ b/ql/src/test/results/clientpositive/exim_10_external_managed.q.out @@ -4,17 +4,23 @@ PREHOOK: query: create external table exim_department ( dep_id int comment "depa location 'ql/test/data/tablestore/exim_department' tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: create external table exim_department ( dep_id int comment "department id") stored as textfile location 'ql/test/data/tablestore/exim_department' tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' diff --git a/ql/src/test/results/clientpositive/exim_11_managed_external.q.out b/ql/src/test/results/clientpositive/exim_11_managed_external.q.out index 0d80aac..6e92058 100644 --- a/ql/src/test/results/clientpositive/exim_11_managed_external.q.out +++ b/ql/src/test/results/clientpositive/exim_11_managed_external.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' diff --git a/ql/src/test/results/clientpositive/exim_12_external_location.q.out b/ql/src/test/results/clientpositive/exim_12_external_location.q.out index 95909dd..ec555b7 100644 --- a/ql/src/test/results/clientpositive/exim_12_external_location.q.out +++ b/ql/src/test/results/clientpositive/exim_12_external_location.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' diff --git a/ql/src/test/results/clientpositive/exim_13_managed_location.q.out b/ql/src/test/results/clientpositive/exim_13_managed_location.q.out index 123cfbd..9097486 100644 --- a/ql/src/test/results/clientpositive/exim_13_managed_location.q.out +++ b/ql/src/test/results/clientpositive/exim_13_managed_location.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' diff --git a/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out b/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out index 77a6e05..16a5bf7 100644 --- a/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out +++ b/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out @@ -2,16 +2,20 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -44,11 +48,15 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id location 'ql/test/data/tablestore/exim_department' tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile location 'ql/test/data/tablestore/exim_department' tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department PREHOOK: query: import table exim_department from 'ql/test/data/exports/exim_department' location 'ql/test/data/tablestore/exim_department' diff --git a/ql/src/test/results/clientpositive/exim_15_external_part.q.out b/ql/src/test/results/clientpositive/exim_15_external_part.q.out index 2e2cbc2..9260591 100644 --- a/ql/src/test/results/clientpositive/exim_15_external_part.q.out +++ b/ql/src/test/results/clientpositive/exim_15_external_part.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### @@ -86,6 +96,8 @@ PREHOOK: query: create external table exim_employee ( emp_id int comment "employ location 'ql/test/data/tablestore/exim_employee' tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:importer POSTHOOK: query: create external table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") @@ -93,23 +105,29 @@ POSTHOOK: query: create external table exim_employee ( emp_id int comment "emplo location 'ql/test/data/tablestore/exim_employee' tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: importer@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: importer@exim_employee POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: importer@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: importer@exim_employee POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn") diff --git a/ql/src/test/results/clientpositive/exim_16_part_external.q.out b/ql/src/test/results/clientpositive/exim_16_part_external.q.out index ca7aaa2..7f5497c 100644 --- a/ql/src/test/results/clientpositive/exim_16_part_external.q.out +++ b/ql/src/test/results/clientpositive/exim_16_part_external.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### @@ -86,6 +96,8 @@ PREHOOK: query: create external table exim_employee ( emp_id int comment "employ location 'ql/test/data/tablestore2/exim_employee' tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:importer POSTHOOK: query: create external table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") @@ -93,6 +105,8 @@ POSTHOOK: query: create external table exim_employee ( emp_id int comment "emplo location 'ql/test/data/tablestore2/exim_employee' tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_employee PREHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn") from 'ql/test/data/exports/exim_employee' diff --git a/ql/src/test/results/clientpositive/exim_17_part_managed.q.out b/ql/src/test/results/clientpositive/exim_17_part_managed.q.out index d16211b..ee18917 100644 --- a/ql/src/test/results/clientpositive/exim_17_part_managed.q.out +++ b/ql/src/test/results/clientpositive/exim_17_part_managed.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### @@ -85,12 +95,14 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_employee PREHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn") from 'ql/test/data/exports/exim_employee' @@ -106,11 +118,13 @@ POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: alter table exim_employee add partition (emp_country="us", emp_state="ap") location 'ql/test/data/tablestore2/exim_employee' PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: importer@exim_employee +PREHOOK: Input: ql/test/data/tablestore2/exim_employee +PREHOOK: Output: importer@exim_employee POSTHOOK: query: alter table exim_employee add partition (emp_country="us", emp_state="ap") location 'ql/test/data/tablestore2/exim_employee' POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: importer@exim_employee +POSTHOOK: Input: ql/test/data/tablestore2/exim_employee +POSTHOOK: Output: importer@exim_employee POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=ap PREHOOK: query: show table extended like exim_employee PREHOOK: type: SHOW_TABLESTATUS diff --git a/ql/src/test/results/clientpositive/exim_18_part_external.q.out b/ql/src/test/results/clientpositive/exim_18_part_external.q.out index 42dd0fb..9838437 100644 --- a/ql/src/test/results/clientpositive/exim_18_part_external.q.out +++ b/ql/src/test/results/clientpositive/exim_18_part_external.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out b/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out index e2e60bf..788c312 100644 --- a/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out +++ b/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out @@ -4,29 +4,35 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test2.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test2.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out b/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out index fcd4c13..f0b9355 100644 --- a/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out +++ b/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out b/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out index 52cd141..07ebc75 100644 --- a/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out +++ b/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out @@ -4,47 +4,57 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=ka PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=tn PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="us", emp_state="ka") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=us/emp_state=ka #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/exim_21_export_authsuccess.q.out b/ql/src/test/results/clientpositive/exim_21_export_authsuccess.q.out index 5b9b81c..10702fd 100644 --- a/ql/src/test/results/clientpositive/exim_21_export_authsuccess.q.out +++ b/ql/src/test/results/clientpositive/exim_21_export_authsuccess.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department PREHOOK: query: grant Select on table exim_department to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE diff --git a/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out b/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out index 6746a44..d6f6809 100644 --- a/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out +++ b/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' @@ -36,8 +40,10 @@ POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_department PREHOOK: query: grant Alter on table exim_department to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE diff --git a/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out b/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out index 4e0dfb0..b0c7a94 100644 --- a/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out +++ b/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out @@ -4,20 +4,24 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_employee PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_employee POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_employee partition (emp_country="in", emp_state="tn") POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_employee POSTHOOK: Output: default@exim_employee@emp_country=in/emp_state=tn #### A masked pattern was here #### @@ -51,12 +55,14 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:importer POSTHOOK: query: create table exim_employee ( emp_id int comment "employee id") comment "employee table" partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text") stored as textfile tblproperties("creator"="krishna") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:importer POSTHOOK: Output: importer@exim_employee PREHOOK: query: grant Alter on table exim_employee to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE diff --git a/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out b/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out index 70e9385..5ef4f77 100644 --- a/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out +++ b/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@exim_department PREHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@exim_department POSTHOOK: query: load data local inpath "../../data/files/test.dat" into table exim_department POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@exim_department #### A masked pattern was here #### PREHOOK: query: export table exim_department to 'ql/test/data/exports/exim_department' diff --git a/ql/src/test/results/clientpositive/explain_dependency2.q.out b/ql/src/test/results/clientpositive/explain_dependency2.q.out index d99a71a..d57655e 100644 --- a/ql/src/test/results/clientpositive/explain_dependency2.q.out +++ b/ql/src/test/results/clientpositive/explain_dependency2.q.out @@ -54,8 +54,10 @@ POSTHOOK: type: QUERY {"input_partitions":[],"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}]} PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: -- select from a partitioned table with no partitions which does not involve a map-reduce job EXPLAIN DEPENDENCY SELECT * FROM tstsrcpart where ds is not null diff --git a/ql/src/test/results/clientpositive/explain_rearrange.q.out b/ql/src/test/results/clientpositive/explain_rearrange.q.out index de61b78..dc443de 100644 --- a/ql/src/test/results/clientpositive/explain_rearrange.q.out +++ b/ql/src/test/results/clientpositive/explain_rearrange.q.out @@ -2,15 +2,19 @@ PREHOOK: query: -- query from auto_sortmerge_join_9.q CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- query from auto_sortmerge_join_9.q CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: -- default behavior diff --git a/ql/src/test/results/clientpositive/external_table_with_space_in_location_path.q.out b/ql/src/test/results/clientpositive/external_table_with_space_in_location_path.q.out index 2b12276..f4e3d4d 100644 --- a/ql/src/test/results/clientpositive/external_table_with_space_in_location_path.q.out +++ b/ql/src/test/results/clientpositive/external_table_with_space_in_location_path.q.out @@ -1,7 +1,11 @@ #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@spacetest PREHOOK: query: SELECT * FROM spacetest PREHOOK: type: QUERY @@ -33,15 +37,19 @@ POSTHOOK: Input: default@spacetest POSTHOOK: Output: default@spacetest PREHOOK: query: CREATE EXTERNAL TABLE spacetestpartition (id int, message string) PARTITIONED BY (day int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE spacetestpartition (id int, message string) PARTITIONED BY (day int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@spacetestpartition #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@spacetestpartition +#### A masked pattern was here #### +PREHOOK: Output: default@spacetestpartition #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@spacetestpartition +#### A masked pattern was here #### +POSTHOOK: Output: default@spacetestpartition POSTHOOK: Output: default@spacetestpartition@day=10 PREHOOK: query: SELECT * FROM spacetestpartition PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/file_with_header_footer.q.out b/ql/src/test/results/clientpositive/file_with_header_footer.q.out index 857ec52..a266012 100644 --- a/ql/src/test/results/clientpositive/file_with_header_footer.q.out +++ b/ql/src/test/results/clientpositive/file_with_header_footer.q.out @@ -1,7 +1,11 @@ #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@header_footer_table_1 PREHOOK: query: SELECT * FROM header_footer_table_1 PREHOOK: type: QUERY @@ -43,29 +47,37 @@ shanyu2 senior 15 david3 oozie 22 PREHOOK: query: CREATE EXTERNAL TABLE header_footer_table_2 (name string, message string, id int) PARTITIONED BY (year int, month int, day int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' tblproperties ("skip.header.line.count"="1", "skip.footer.line.count"="2") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE header_footer_table_2 (name string, message string, id int) PARTITIONED BY (year int, month int, day int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' tblproperties ("skip.header.line.count"="1", "skip.footer.line.count"="2") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@header_footer_table_2 #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@header_footer_table_2 +#### A masked pattern was here #### +PREHOOK: Output: default@header_footer_table_2 #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@header_footer_table_2 +#### A masked pattern was here #### +POSTHOOK: Output: default@header_footer_table_2 POSTHOOK: Output: default@header_footer_table_2@year=2012/month=1/day=1 #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@header_footer_table_2 +#### A masked pattern was here #### +PREHOOK: Output: default@header_footer_table_2 #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@header_footer_table_2 +#### A masked pattern was here #### +POSTHOOK: Output: default@header_footer_table_2 POSTHOOK: Output: default@header_footer_table_2@year=2012/month=1/day=2 #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@header_footer_table_2 +#### A masked pattern was here #### +PREHOOK: Output: default@header_footer_table_2 #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@header_footer_table_2 +#### A masked pattern was here #### +POSTHOOK: Output: default@header_footer_table_2 POSTHOOK: Output: default@header_footer_table_2@year=2012/month=1/day=3 PREHOOK: query: SELECT * FROM header_footer_table_2 PREHOOK: type: QUERY @@ -120,7 +132,11 @@ david3 oozie 22 2012 1 3 #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@emptytable PREHOOK: query: SELECT * FROM emptytable PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/fileformat_mix.q.out b/ql/src/test/results/clientpositive/fileformat_mix.q.out index 32ad9e8..7e60033 100644 --- a/ql/src/test/results/clientpositive/fileformat_mix.q.out +++ b/ql/src/test/results/clientpositive/fileformat_mix.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table fileformat_mix_test (src int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table fileformat_mix_test (src int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@fileformat_mix_test PREHOOK: query: alter table fileformat_mix_test set fileformat Sequencefile PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -25,10 +27,10 @@ POSTHOOK: Lineage: fileformat_mix_test PARTITION(ds=1).src EXPRESSION [(src)src. POSTHOOK: Lineage: fileformat_mix_test PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: alter table fileformat_mix_test add partition (ds='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@fileformat_mix_test +PREHOOK: Output: default@fileformat_mix_test POSTHOOK: query: alter table fileformat_mix_test add partition (ds='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@fileformat_mix_test +POSTHOOK: Output: default@fileformat_mix_test POSTHOOK: Output: default@fileformat_mix_test@ds=2 POSTHOOK: Lineage: fileformat_mix_test PARTITION(ds=1).src EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: fileformat_mix_test PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out b/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out index 71034bd..82b3667 100644 --- a/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out +++ b/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out @@ -24,10 +24,12 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: DESCRIBE EXTENDED dest1 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/fileformat_text.q.out b/ql/src/test/results/clientpositive/fileformat_text.q.out index 005abbe..efb0ca2 100644 --- a/ql/src/test/results/clientpositive/fileformat_text.q.out +++ b/ql/src/test/results/clientpositive/fileformat_text.q.out @@ -24,10 +24,12 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: DESCRIBE EXTENDED dest1 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out index ff91d35..a969330 100644 --- a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out +++ b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@filter_join_breaktask PREHOOK: query: INSERT OVERWRITE TABLE filter_join_breaktask PARTITION(ds='2008-04-08') SELECT key, value from src1 diff --git a/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out b/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out index 1583207..20b4589 100644 --- a/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out +++ b/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out @@ -1,24 +1,32 @@ PREHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T4 PREHOOK: query: insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/filter_numeric.q.out b/ql/src/test/results/clientpositive/filter_numeric.q.out index d1fe77f..f0d8374 100644 --- a/ql/src/test/results/clientpositive/filter_numeric.q.out +++ b/ql/src/test/results/clientpositive/filter_numeric.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partint(key string, value string) partitioned by (ds string, hr int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partint(key string, value string) partitioned by (ds string, hr int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partint PREHOOK: query: insert overwrite table partint partition(ds, hr) select * from srcpart where ds = '2008-04-08' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/global_limit.q.out b/ql/src/test/results/clientpositive/global_limit.q.out index cdb8526..c5e8f32 100644 --- a/ql/src/test/results/clientpositive/global_limit.q.out +++ b/ql/src/test/results/clientpositive/global_limit.q.out @@ -16,26 +16,34 @@ POSTHOOK: query: drop table gl_src_part1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table gl_src1 (key int, value string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table gl_src1 (key int, value string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@gl_src1 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@gl_src1 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@gl_src1 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@gl_src1 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@gl_src1 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@gl_src1 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@gl_src1 PREHOOK: query: -- need one file create table gl_tgt as select key from gl_src1 limit 1 @@ -1112,9 +1120,11 @@ POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, PREHOOK: query: -- empty table create table gl_src2 (key int, value string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- empty table create table gl_src2 (key int, value string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@gl_src2 POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: select key from gl_src2 ORDER BY key ASC limit 10 @@ -1129,39 +1139,49 @@ POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, PREHOOK: query: -- partition create table gl_src_part1 (key int, value string) partitioned by (p string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- partition create table gl_src_part1 (key int, value string) partitioned by (p string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@gl_src_part1 POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE gl_src_part1 partition(p='11') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@gl_src_part1 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE gl_src_part1 partition(p='11') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@gl_src_part1 POSTHOOK: Output: default@gl_src_part1@p=11 POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src_part1 partition(p='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@gl_src_part1 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src_part1 partition(p='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@gl_src_part1 POSTHOOK: Output: default@gl_src_part1@p=12 POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src_part1 partition(p='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@gl_src_part1@p=12 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src_part1 partition(p='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@gl_src_part1@p=12 POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src_part1 partition(p='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@gl_src_part1@p=12 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE gl_src_part1 partition(p='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@gl_src_part1@p=12 POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: select key from gl_src_part1 where p like '1%' ORDER BY key ASC limit 10 @@ -1240,10 +1260,10 @@ POSTHOOK: Input: default@gl_src_part1 POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: alter table gl_src_part1 add partition (p='13') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@gl_src_part1 +PREHOOK: Output: default@gl_src_part1 POSTHOOK: query: alter table gl_src_part1 add partition (p='13') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@gl_src_part1 +POSTHOOK: Output: default@gl_src_part1 POSTHOOK: Output: default@gl_src_part1@p=13 POSTHOOK: Lineage: gl_tgt.key EXPRESSION [(gl_src1)gl_src1.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: select key from gl_src_part1 where p='13' ORDER BY key ASC limit 10 diff --git a/ql/src/test/results/clientpositive/groupby1.q.out b/ql/src/test/results/clientpositive/groupby1.q.out index 49786a7..306efe5 100644 --- a/ql/src/test/results/clientpositive/groupby1.q.out +++ b/ql/src/test/results/clientpositive/groupby1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_g1(key INT, value DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g1(key INT, value DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest_g1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key diff --git a/ql/src/test/results/clientpositive/groupby10.q.out b/ql/src/test/results/clientpositive/groupby10.q.out index 341427f..9d5310b 100644 --- a/ql/src/test/results/clientpositive/groupby10.q.out +++ b/ql/src/test/results/clientpositive/groupby10.q.out @@ -1,23 +1,31 @@ PREHOOK: query: CREATE TABLE dest1(key INT, val1 INT, val2 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, val1 INT, val2 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: CREATE TABLE dest2(key INT, val1 INT, val2 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest2(key INT, val1 INT, val2 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 PREHOOK: query: CREATE TABLE INPUT(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUT(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUT PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv5.txt' INTO TABLE INPUT PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@input POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv5.txt' INTO TABLE INPUT POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@input PREHOOK: query: EXPLAIN FROM INPUT diff --git a/ql/src/test/results/clientpositive/groupby11.q.out b/ql/src/test/results/clientpositive/groupby11.q.out index 69921c2..35536d3 100644 --- a/ql/src/test/results/clientpositive/groupby11.q.out +++ b/ql/src/test/results/clientpositive/groupby11.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, val1 INT, val2 INT) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, val1 INT, val2 INT) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: CREATE TABLE dest2(key STRING, val1 INT, val2 INT) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest2(key STRING, val1 INT, val2 INT) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby12.q.out b/ql/src/test/results/clientpositive/groupby12.q.out index 5a3a4e9..b5f90d0 100644 --- a/ql/src/test/results/clientpositive/groupby12.q.out +++ b/ql/src/test/results/clientpositive/groupby12.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby1_limit.q.out b/ql/src/test/results/clientpositive/groupby1_limit.q.out index 4d09bf2..18f8a4a 100644 --- a/ql/src/test/results/clientpositive/groupby1_limit.q.out +++ b/ql/src/test/results/clientpositive/groupby1_limit.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key LIMIT 5 diff --git a/ql/src/test/results/clientpositive/groupby1_map.q.out b/ql/src/test/results/clientpositive/groupby1_map.q.out index 5bc1dda..ac7b749 100644 --- a/ql/src/test/results/clientpositive/groupby1_map.q.out +++ b/ql/src/test/results/clientpositive/groupby1_map.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key diff --git a/ql/src/test/results/clientpositive/groupby1_map_nomap.q.out b/ql/src/test/results/clientpositive/groupby1_map_nomap.q.out index 5bc1dda..ac7b749 100644 --- a/ql/src/test/results/clientpositive/groupby1_map_nomap.q.out +++ b/ql/src/test/results/clientpositive/groupby1_map_nomap.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key diff --git a/ql/src/test/results/clientpositive/groupby1_map_skew.q.out b/ql/src/test/results/clientpositive/groupby1_map_skew.q.out index 101f4a4..61bf790 100644 --- a/ql/src/test/results/clientpositive/groupby1_map_skew.q.out +++ b/ql/src/test/results/clientpositive/groupby1_map_skew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key diff --git a/ql/src/test/results/clientpositive/groupby1_noskew.q.out b/ql/src/test/results/clientpositive/groupby1_noskew.q.out index f7fcc28..762e1a6 100644 --- a/ql/src/test/results/clientpositive/groupby1_noskew.q.out +++ b/ql/src/test/results/clientpositive/groupby1_noskew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_g1(key INT, value DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g1(key INT, value DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest_g1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key diff --git a/ql/src/test/results/clientpositive/groupby2.q.out b/ql/src/test/results/clientpositive/groupby2.q.out index 68da953..20d2f52 100644 --- a/ql/src/test/results/clientpositive/groupby2.q.out +++ b/ql/src/test/results/clientpositive/groupby2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g2 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby2_map.q.out b/ql/src/test/results/clientpositive/groupby2_map.q.out index c63dc5e..51c5bbe 100644 --- a/ql/src/test/results/clientpositive/groupby2_map.q.out +++ b/ql/src/test/results/clientpositive/groupby2_map.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out b/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out index d99b794..1455594 100644 --- a/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby2_map_skew.q.out b/ql/src/test/results/clientpositive/groupby2_map_skew.q.out index bbccd08..d005b6c 100644 --- a/ql/src/test/results/clientpositive/groupby2_map_skew.q.out +++ b/ql/src/test/results/clientpositive/groupby2_map_skew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby2_noskew.q.out b/ql/src/test/results/clientpositive/groupby2_noskew.q.out index 68da953..20d2f52 100644 --- a/ql/src/test/results/clientpositive/groupby2_noskew.q.out +++ b/ql/src/test/results/clientpositive/groupby2_noskew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g2 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out b/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out index 5dd2d79..a76c6e3 100644 --- a/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g2 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby3.q.out b/ql/src/test/results/clientpositive/groupby3.q.out index a74f2b5..d70e564 100644 --- a/ql/src/test/results/clientpositive/groupby3.q.out +++ b/ql/src/test/results/clientpositive/groupby3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby3_map.q.out b/ql/src/test/results/clientpositive/groupby3_map.q.out index 9424071..e84608e 100644 --- a/ql/src/test/results/clientpositive/groupby3_map.q.out +++ b/ql/src/test/results/clientpositive/groupby3_map.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out b/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out index 9bcd7c9..0ad6525 100644 --- a/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby3_map_skew.q.out b/ql/src/test/results/clientpositive/groupby3_map_skew.q.out index f438f89..4baea0f 100644 --- a/ql/src/test/results/clientpositive/groupby3_map_skew.q.out +++ b/ql/src/test/results/clientpositive/groupby3_map_skew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby3_noskew.q.out b/ql/src/test/results/clientpositive/groupby3_noskew.q.out index c461da3..ea747b6 100644 --- a/ql/src/test/results/clientpositive/groupby3_noskew.q.out +++ b/ql/src/test/results/clientpositive/groupby3_noskew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out b/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out index 6ba3342..3ca255b 100644 --- a/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby4.q.out b/ql/src/test/results/clientpositive/groupby4.q.out index 7e5e621..6f0c010 100644 --- a/ql/src/test/results/clientpositive/groupby4.q.out +++ b/ql/src/test/results/clientpositive/groupby4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby4_map.q.out b/ql/src/test/results/clientpositive/groupby4_map.q.out index ac68f53..8aaf825 100644 --- a/ql/src/test/results/clientpositive/groupby4_map.q.out +++ b/ql/src/test/results/clientpositive/groupby4_map.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT count(1) diff --git a/ql/src/test/results/clientpositive/groupby4_map_skew.q.out b/ql/src/test/results/clientpositive/groupby4_map_skew.q.out index e4183e8..c9f1716 100644 --- a/ql/src/test/results/clientpositive/groupby4_map_skew.q.out +++ b/ql/src/test/results/clientpositive/groupby4_map_skew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT count(1) diff --git a/ql/src/test/results/clientpositive/groupby4_noskew.q.out b/ql/src/test/results/clientpositive/groupby4_noskew.q.out index 559353a..597fa64 100644 --- a/ql/src/test/results/clientpositive/groupby4_noskew.q.out +++ b/ql/src/test/results/clientpositive/groupby4_noskew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby5.q.out b/ql/src/test/results/clientpositive/groupby5.q.out index 5e91c1e..ee26f0c 100644 --- a/ql/src/test/results/clientpositive/groupby5.q.out +++ b/ql/src/test/results/clientpositive/groupby5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE dest1 diff --git a/ql/src/test/results/clientpositive/groupby5_map.q.out b/ql/src/test/results/clientpositive/groupby5_map.q.out index a021874..edf7ab1 100644 --- a/ql/src/test/results/clientpositive/groupby5_map.q.out +++ b/ql/src/test/results/clientpositive/groupby5_map.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT sum(src.key) diff --git a/ql/src/test/results/clientpositive/groupby5_map_skew.q.out b/ql/src/test/results/clientpositive/groupby5_map_skew.q.out index 9beca3f..8fbc808 100644 --- a/ql/src/test/results/clientpositive/groupby5_map_skew.q.out +++ b/ql/src/test/results/clientpositive/groupby5_map_skew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT sum(src.key) diff --git a/ql/src/test/results/clientpositive/groupby5_noskew.q.out b/ql/src/test/results/clientpositive/groupby5_noskew.q.out index fb2197d..8a7d93d 100644 --- a/ql/src/test/results/clientpositive/groupby5_noskew.q.out +++ b/ql/src/test/results/clientpositive/groupby5_noskew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE dest1 diff --git a/ql/src/test/results/clientpositive/groupby6.q.out b/ql/src/test/results/clientpositive/groupby6.q.out index 16d58e9..a445634 100644 --- a/ql/src/test/results/clientpositive/groupby6.q.out +++ b/ql/src/test/results/clientpositive/groupby6.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby6_map.q.out b/ql/src/test/results/clientpositive/groupby6_map.q.out index 4623771..68a398a 100644 --- a/ql/src/test/results/clientpositive/groupby6_map.q.out +++ b/ql/src/test/results/clientpositive/groupby6_map.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby6_map_skew.q.out b/ql/src/test/results/clientpositive/groupby6_map_skew.q.out index b67c751..46aface 100644 --- a/ql/src/test/results/clientpositive/groupby6_map_skew.q.out +++ b/ql/src/test/results/clientpositive/groupby6_map_skew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby6_noskew.q.out b/ql/src/test/results/clientpositive/groupby6_noskew.q.out index 6b1501d..fe582a7 100644 --- a/ql/src/test/results/clientpositive/groupby6_noskew.q.out +++ b/ql/src/test/results/clientpositive/groupby6_noskew.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby7.q.out b/ql/src/test/results/clientpositive/groupby7.q.out index 5cbe4a5..80121f3 100644 --- a/ql/src/test/results/clientpositive/groupby7.q.out +++ b/ql/src/test/results/clientpositive/groupby7.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: FROM SRC INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key diff --git a/ql/src/test/results/clientpositive/groupby7_map.q.out b/ql/src/test/results/clientpositive/groupby7_map.q.out index 488e3c6..92183fe 100644 --- a/ql/src/test/results/clientpositive/groupby7_map.q.out +++ b/ql/src/test/results/clientpositive/groupby7_map.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby7_map_multi_single_reducer.q.out b/ql/src/test/results/clientpositive/groupby7_map_multi_single_reducer.q.out index ad3bc4c..30b6eae 100644 --- a/ql/src/test/results/clientpositive/groupby7_map_multi_single_reducer.q.out +++ b/ql/src/test/results/clientpositive/groupby7_map_multi_single_reducer.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby7_map_skew.q.out b/ql/src/test/results/clientpositive/groupby7_map_skew.q.out index b23121b..efa5a14 100644 --- a/ql/src/test/results/clientpositive/groupby7_map_skew.q.out +++ b/ql/src/test/results/clientpositive/groupby7_map_skew.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby7_noskew.q.out b/ql/src/test/results/clientpositive/groupby7_noskew.q.out index eb13bb8..73e0938 100644 --- a/ql/src/test/results/clientpositive/groupby7_noskew.q.out +++ b/ql/src/test/results/clientpositive/groupby7_noskew.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out b/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out index 5fcc176..661d6f3 100644 --- a/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out +++ b/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby8.q.out b/ql/src/test/results/clientpositive/groupby8.q.out index 960a2bd..84108a2 100644 --- a/ql/src/test/results/clientpositive/groupby8.q.out +++ b/ql/src/test/results/clientpositive/groupby8.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby8_map.q.out b/ql/src/test/results/clientpositive/groupby8_map.q.out index fc429b2..54b6048 100644 --- a/ql/src/test/results/clientpositive/groupby8_map.q.out +++ b/ql/src/test/results/clientpositive/groupby8_map.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby8_map_skew.q.out b/ql/src/test/results/clientpositive/groupby8_map_skew.q.out index fc429b2..54b6048 100644 --- a/ql/src/test/results/clientpositive/groupby8_map_skew.q.out +++ b/ql/src/test/results/clientpositive/groupby8_map_skew.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby8_noskew.q.out b/ql/src/test/results/clientpositive/groupby8_noskew.q.out index fc429b2..54b6048 100644 --- a/ql/src/test/results/clientpositive/groupby8_noskew.q.out +++ b/ql/src/test/results/clientpositive/groupby8_noskew.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby9.q.out b/ql/src/test/results/clientpositive/groupby9.q.out index e5caf02..1084056 100644 --- a/ql/src/test/results/clientpositive/groupby9.q.out +++ b/ql/src/test/results/clientpositive/groupby9.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key INT, val1 STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, val1 STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby_complex_types.q.out b/ql/src/test/results/clientpositive/groupby_complex_types.q.out index 16f742e..fed1f8b 100644 --- a/ql/src/test/results/clientpositive/groupby_complex_types.q.out +++ b/ql/src/test/results/clientpositive/groupby_complex_types.q.out @@ -1,17 +1,23 @@ PREHOOK: query: CREATE TABLE DEST1(key ARRAY, value BIGINT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key ARRAY, value BIGINT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key MAP, value BIGINT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key MAP, value BIGINT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: CREATE TABLE DEST3(key STRUCT, value BIGINT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST3(key STRUCT, value BIGINT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST3 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out b/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out index fd98abd..96c095b 100644 --- a/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out +++ b/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key ARRAY, value BIGINT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key ARRAY, value BIGINT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key MAP, value BIGINT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key MAP, value BIGINT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: EXPLAIN FROM SRC diff --git a/ql/src/test/results/clientpositive/groupby_cube1.q.out b/ql/src/test/results/clientpositive/groupby_cube1.q.out index 4a92086..92d81f4 100644 --- a/ql/src/test/results/clientpositive/groupby_cube1.q.out +++ b/ql/src/test/results/clientpositive/groupby_cube1.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: EXPLAIN SELECT key, val, count(1) FROM T1 GROUP BY key, val with cube @@ -348,13 +352,17 @@ NULL 6 8 2 PREHOOK: query: CREATE TABLE T2(key1 STRING, key2 STRING, val INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key1 STRING, key2 STRING, val INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: CREATE TABLE T3(key1 STRING, key2 STRING, val INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key1 STRING, key2 STRING, val INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: EXPLAIN FROM T1 diff --git a/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out b/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out index c28e31e..b405978 100644 --- a/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out +++ b/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- This test covers HIVE-2332 create table t1 (int1 int, int2 int, str1 string, str2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test covers HIVE-2332 create table t1 (int1 int, int2 int, str1 string, str2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: --disabled RS-dedup for keeping intention of test diff --git a/ql/src/test/results/clientpositive/groupby_grouping_id1.q.out b/ql/src/test/results/clientpositive/groupby_grouping_id1.q.out index b972173..0f6123e 100644 --- a/ql/src/test/results/clientpositive/groupby_grouping_id1.q.out +++ b/ql/src/test/results/clientpositive/groupby_grouping_id1.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: SELECT key, val, GROUPING__ID from T1 group by key, val with cube PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/groupby_grouping_id2.q.out b/ql/src/test/results/clientpositive/groupby_grouping_id2.q.out index 077a63f..80d6c29 100644 --- a/ql/src/test/results/clientpositive/groupby_grouping_id2.q.out +++ b/ql/src/test/results/clientpositive/groupby_grouping_id2.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE T1(key INT, value INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key INT, value INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/groupby_groupingid.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/groupby_groupingid.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: SELECT key, value, GROUPING__ID, count(*) from T1 GROUP BY key, value WITH ROLLUP PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out b/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out index d2934ba..0665eb4 100644 --- a/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out +++ b/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: SELECT * FROM T1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out b/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out index 745a40c..a2568d6 100644 --- a/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out +++ b/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- Since 4 grouping sets would be generated for the query below, an additional MR job should be created EXPLAIN @@ -221,8 +225,10 @@ NULL 3 5.0 8 1 1.0 PREHOOK: query: CREATE TABLE T2(a STRING, b STRING, c int, d int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(a STRING, b STRING, c int, d int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: INSERT OVERWRITE TABLE T2 SELECT a, b, c, c from T1 diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out b/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out index 310a202..d38e07a 100644 --- a/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out +++ b/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out @@ -4,24 +4,30 @@ PREHOOK: query: -- In this test, 2 files are loaded into table T1. The data cont -- additional MR job is created for processing the grouping sets. CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- In this test, 2 files are loaded into table T1. The data contains rows with the same value of a and b, -- with different number of rows for a and b in each file. Since bucketizedHiveInputFormat is used, -- this tests that the aggregate function stores the partial aggregate state correctly even if an -- additional MR job is created for processing the grouping sets. CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets2.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets2.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- The query below will execute in a single MR job, since 4 rows are generated per input row -- (cube of a,b will lead to (a,b), (a, null), (null, b) and (null, null) and diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out index f5d3633..dea607b 100644 --- a/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out +++ b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out @@ -2,16 +2,20 @@ PREHOOK: query: -- Set merging to false above to make the explain more readable CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Set merging to false above to make the explain more readable CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- This tests that cubes and rollups work fine inside sub-queries. EXPLAIN diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out b/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out index dce3077..83ac2e3 100644 --- a/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out +++ b/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out @@ -2,16 +2,20 @@ PREHOOK: query: -- Set merging to false above to make the explain more readable CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Set merging to false above to make the explain more readable CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- This tests that cubes and rollups work fine where the source is a sub-query EXPLAIN diff --git a/ql/src/test/results/clientpositive/groupby_map_ppr.q.out b/ql/src/test/results/clientpositive/groupby_map_ppr.q.out index 89c7299..0cf5326 100644 --- a/ql/src/test/results/clientpositive/groupby_map_ppr.q.out +++ b/ql/src/test/results/clientpositive/groupby_map_ppr.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN EXTENDED FROM srcpart src diff --git a/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out b/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out index 12f1fcf..21da0dd 100644 --- a/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, C3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, C3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN EXTENDED FROM srcpart src diff --git a/ql/src/test/results/clientpositive/groupby_multi_insert_common_distinct.q.out b/ql/src/test/results/clientpositive/groupby_multi_insert_common_distinct.q.out index f9406e6..ad76252 100644 --- a/ql/src/test/results/clientpositive/groupby_multi_insert_common_distinct.q.out +++ b/ql/src/test/results/clientpositive/groupby_multi_insert_common_distinct.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table dest1(key int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest1(key int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: create table dest2(key int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest2(key int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 PREHOOK: query: explain from src diff --git a/ql/src/test/results/clientpositive/groupby_multi_single_reducer.q.out b/ql/src/test/results/clientpositive/groupby_multi_single_reducer.q.out index fe00553..175ff91 100644 --- a/ql/src/test/results/clientpositive/groupby_multi_single_reducer.q.out +++ b/ql/src/test/results/clientpositive/groupby_multi_single_reducer.q.out @@ -1,27 +1,37 @@ PREHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g2 PREHOOK: query: CREATE TABLE dest_g3(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g3(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g3 PREHOOK: query: CREATE TABLE dest_g4(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g4(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g4 PREHOOK: query: CREATE TABLE dest_h2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_h2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_h2 PREHOOK: query: CREATE TABLE dest_h3(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_h3(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_h3 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out b/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out index c3680ad..8b383a0 100644 --- a/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out +++ b/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g2(key STRING, c1 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g2 PREHOOK: query: CREATE TABLE dest_g3(key STRING, c1 INT, c2 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_g3(key STRING, c1 INT, c2 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g3 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/groupby_multi_single_reducer3.q.out b/ql/src/test/results/clientpositive/groupby_multi_single_reducer3.q.out index 6a462a3..51a70c4 100644 --- a/ql/src/test/results/clientpositive/groupby_multi_single_reducer3.q.out +++ b/ql/src/test/results/clientpositive/groupby_multi_single_reducer3.q.out @@ -1,14 +1,18 @@ PREHOOK: query: -- HIVE-3849 Aliased column in where clause for multi-groupby single reducer cannot be resolved create table e1 (key string, count int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-3849 Aliased column in where clause for multi-groupby single reducer cannot be resolved create table e1 (key string, count int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e1 PREHOOK: query: create table e2 (key string, count int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table e2 (key string, count int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e2 PREHOOK: query: explain from src diff --git a/ql/src/test/results/clientpositive/groupby_position.q.out b/ql/src/test/results/clientpositive/groupby_position.q.out index 6c96be0..727bccb 100644 --- a/ql/src/test/results/clientpositive/groupby_position.q.out +++ b/ql/src/test/results/clientpositive/groupby_position.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE testTable1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE testTable1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@testTable1 PREHOOK: query: CREATE TABLE testTable2(key INT, val1 STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE testTable2(key INT, val1 STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@testTable2 PREHOOK: query: -- Position Alias in GROUP BY and ORDER BY diff --git a/ql/src/test/results/clientpositive/groupby_ppd.q.out b/ql/src/test/results/clientpositive/groupby_ppd.q.out index a81c772..9b145a5 100644 --- a/ql/src/test/results/clientpositive/groupby_ppd.q.out +++ b/ql/src/test/results/clientpositive/groupby_ppd.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- see HIVE-2382 create table invites (id int, foo int, bar int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- see HIVE-2382 create table invites (id int, foo int, bar int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@invites PREHOOK: query: explain select * from (select foo, bar from (select bar, foo from invites c union all select bar, foo from invites d) b) a group by bar, foo having bar=1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/groupby_ppr.q.out b/ql/src/test/results/clientpositive/groupby_ppr.q.out index c8eed7c..7e158ed 100644 --- a/ql/src/test/results/clientpositive/groupby_ppr.q.out +++ b/ql/src/test/results/clientpositive/groupby_ppr.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN EXTENDED FROM srcpart src diff --git a/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out b/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out index 31d6dec..8cc41ca 100644 --- a/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN EXTENDED FROM srcpart src diff --git a/ql/src/test/results/clientpositive/groupby_rollup1.q.out b/ql/src/test/results/clientpositive/groupby_rollup1.q.out index 1f2e757..36bf966 100644 --- a/ql/src/test/results/clientpositive/groupby_rollup1.q.out +++ b/ql/src/test/results/clientpositive/groupby_rollup1.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: EXPLAIN SELECT key, val, count(1) FROM T1 GROUP BY key, val with rollup @@ -336,13 +340,17 @@ NULL 6 8 2 PREHOOK: query: CREATE TABLE T2(key1 STRING, key2 STRING, val INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key1 STRING, key2 STRING, val INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: CREATE TABLE T3(key1 STRING, key2 STRING, val INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key1 STRING, key2 STRING, val INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: EXPLAIN FROM T1 diff --git a/ql/src/test/results/clientpositive/groupby_sort_1.q.out b/ql/src/test/results/clientpositive/groupby_sort_1.q.out index b1f7f41..f93795a 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_1.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_1.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- perform an insert to make sure there are 2 files INSERT OVERWRITE TABLE T1 select key, val from T1 @@ -25,8 +29,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE outputTbl1(key int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl1(key int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] @@ -385,8 +391,10 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 2 PREHOOK: query: CREATE TABLE outputTbl2(key1 int, key2 string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl2(key1 int, key2 string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] @@ -1466,8 +1474,10 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 2 PREHOOK: query: CREATE TABLE outputTbl3(key1 int, key2 int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl3(key1 int, key2 int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl3 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -1865,8 +1875,10 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 1 8 2 PREHOOK: query: CREATE TABLE outputTbl4(key1 int, key2 int, key3 string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl4(key1 int, key2 int, key3 string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl4 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -4790,9 +4802,11 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) CLUSTERED BY (key, val) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) CLUSTERED BY (key, val) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -5673,8 +5687,10 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 1 28 1 PREHOOK: query: CREATE TABLE outputTbl5(key1 int, key2 int, key3 string, key4 int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl5(key1 int, key2 int, key3 string, key4 int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl5 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -7337,8 +7353,10 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 2 28 1 PREHOOK: query: CREATE TABLE DEST1(key INT, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -7392,8 +7410,10 @@ POSTHOOK: Lineage: t2.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE DEST2(key INT, val STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, val STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] diff --git a/ql/src/test/results/clientpositive/groupby_sort_10.q.out b/ql/src/test/results/clientpositive/groupby_sort_10.q.out index 9372e4f..b8ccdf6 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_10.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_10.q.out @@ -1,9 +1,11 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: -- perform an insert to make sure there are 2 files INSERT OVERWRITE TABLE T1 PARTITION (ds='1') diff --git a/ql/src/test/results/clientpositive/groupby_sort_11.q.out b/ql/src/test/results/clientpositive/groupby_sort_11.q.out index 12344a5..8ee7571 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_11.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_11.q.out @@ -1,9 +1,11 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: -- perform an insert to make sure there are 2 files INSERT OVERWRITE TABLE T1 PARTITION (ds='1') diff --git a/ql/src/test/results/clientpositive/groupby_sort_2.q.out b/ql/src/test/results/clientpositive/groupby_sort_2.q.out index 559e98f..63150b5 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_2.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_2.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (val) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (val) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- perform an insert to make sure there are 2 files INSERT OVERWRITE TABLE T1 select key, val from T1 @@ -25,8 +29,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE outputTbl1(val string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl1(val string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/groupby_sort_3.q.out b/ql/src/test/results/clientpositive/groupby_sort_3.q.out index a8fc962..8509d51 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_3.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_3.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- perform an insert to make sure there are 2 files INSERT OVERWRITE TABLE T1 select key, val from T1 @@ -25,8 +29,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE outputTbl1(key string, val string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl1(key string, val string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] @@ -170,8 +176,10 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 28 1 PREHOOK: query: CREATE TABLE outputTbl2(key string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl2(key string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/groupby_sort_4.q.out b/ql/src/test/results/clientpositive/groupby_sort_4.q.out index f1fb04e..72f8c32 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_4.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_4.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key, val) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key, val) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- perform an insert to make sure there are 2 files INSERT OVERWRITE TABLE T1 select key, val from T1 @@ -25,8 +29,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE outputTbl1(key STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl1(key STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] @@ -139,8 +145,10 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 2 PREHOOK: query: CREATE TABLE outputTbl2(key STRING, val STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl2(key STRING, val STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/groupby_sort_5.q.out b/ql/src/test/results/clientpositive/groupby_sort_5.q.out index 8156361..b4d745c 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_5.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_5.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (val) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (val) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- perform an insert to make sure there are 2 files INSERT OVERWRITE TABLE T1 select key, val from T1 @@ -25,8 +29,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE outputTbl1(key STRING, val STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl1(key STRING, val STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] @@ -188,9 +194,11 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (val, key) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (val, key) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] @@ -199,9 +207,11 @@ POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] @@ -403,9 +413,11 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (val) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (val) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -419,9 +431,11 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -457,8 +471,10 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE outputTbl2(key STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl2(key STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] diff --git a/ql/src/test/results/clientpositive/groupby_sort_6.q.out b/ql/src/test/results/clientpositive/groupby_sort_6.q.out index 3362408..50e971a 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_6.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_6.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: CREATE TABLE outputTbl1(key int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl1(key int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: -- The plan should not be converted to a map-side group since no partition is being accessed EXPLAIN EXTENDED @@ -143,9 +147,11 @@ POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PARTITION (ds='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PARTITION (ds='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 POSTHOOK: Output: default@t1@ds=2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] diff --git a/ql/src/test/results/clientpositive/groupby_sort_7.q.out b/ql/src/test/results/clientpositive/groupby_sort_7.q.out index f6bcf56..416d3f1 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_7.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_7.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (val) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (val) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PARTITION (ds='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PARTITION (ds='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 POSTHOOK: Output: default@t1@ds=1 PREHOOK: query: -- perform an insert to make sure there are 2 files @@ -28,8 +32,10 @@ POSTHOOK: Lineage: t1 PARTITION(ds=1).key SIMPLE [(t1)t1.FieldSchema(name:key, t POSTHOOK: Lineage: t1 PARTITION(ds=1).val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE outputTbl1(key STRING, val STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl1(key STRING, val STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 POSTHOOK: Lineage: t1 PARTITION(ds=1).key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1 PARTITION(ds=1).val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/groupby_sort_8.q.out b/ql/src/test/results/clientpositive/groupby_sort_8.q.out index 975c4d1..a27cfaa 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_8.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_8.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PARTITION (ds='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PARTITION (ds='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 POSTHOOK: Output: default@t1@ds=1 PREHOOK: query: -- perform an insert to make sure there are 2 files diff --git a/ql/src/test/results/clientpositive/groupby_sort_9.q.out b/ql/src/test/results/clientpositive/groupby_sort_9.q.out index db0d2e3..d110d3b 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_9.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_9.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) PARTITIONED BY (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PARTITION (ds='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PARTITION (ds='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 POSTHOOK: Output: default@t1@ds=1 PREHOOK: query: -- perform an insert to make sure there are 2 files diff --git a/ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out b/ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out index d1937b9..94360a8 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- perform an insert to make sure there are 2 files INSERT OVERWRITE TABLE T1 select key, val from T1 @@ -25,8 +29,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE outputTbl1(key int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl1(key int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] @@ -385,8 +391,10 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 2 PREHOOK: query: CREATE TABLE outputTbl2(key1 int, key2 string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl2(key1 int, key2 string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] @@ -1530,8 +1538,10 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 2 PREHOOK: query: CREATE TABLE outputTbl3(key1 int, key2 int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl3(key1 int, key2 int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl3 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -1929,8 +1939,10 @@ POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 1 8 2 PREHOOK: query: CREATE TABLE outputTbl4(key1 int, key2 int, key3 string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl4(key1 int, key2 int, key3 string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl4 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -5174,9 +5186,11 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) CLUSTERED BY (key, val) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) CLUSTERED BY (key, val) SORTED BY (key, val) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -6121,8 +6135,10 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 1 28 1 PREHOOK: query: CREATE TABLE outputTbl5(key1 int, key2 int, key3 string, key4 int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl5(key1 int, key2 int, key3 string, key4 int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl5 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -7785,8 +7801,10 @@ POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comm 8 2 28 1 PREHOOK: query: CREATE TABLE DEST1(key INT, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key INT, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] @@ -7840,8 +7858,10 @@ POSTHOOK: Lineage: t2.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t2.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE DEST2(key INT, val STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key INT, val STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] POSTHOOK: Lineage: outputtbl1.cnt EXPRESSION [(t1)t1.null, ] diff --git a/ql/src/test/results/clientpositive/groupby_sort_test_1.q.out b/ql/src/test/results/clientpositive/groupby_sort_test_1.q.out index 1773686..7fd6bdb 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_test_1.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_test_1.q.out @@ -1,15 +1,19 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: -- perform an insert to make sure there are 2 files INSERT OVERWRITE TABLE T1 select key, val from T1 @@ -25,8 +29,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comm POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE outputTbl1(key int, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE outputTbl1(key int, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 POSTHOOK: Lineage: t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(t1)t1.FieldSchema(name:val, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/hook_context_cs.q.out b/ql/src/test/results/clientpositive/hook_context_cs.q.out index 9f13be3..c3f335b 100644 --- a/ql/src/test/results/clientpositive/hook_context_cs.q.out +++ b/ql/src/test/results/clientpositive/hook_context_cs.q.out @@ -4,15 +4,19 @@ POSTHOOK: query: drop table vcsc POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE vcsc (c STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE vcsc (c STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@vcsc #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@vcsc +#### A masked pattern was here #### +PREHOOK: Output: default@vcsc #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@vcsc +#### A masked pattern was here #### +POSTHOOK: Output: default@vcsc POSTHOOK: Output: default@vcsc@ds=dummy POSTHOOK: query: SELECT a.c, b.c FROM vcsc a JOIN vcsc b ON a.ds = 'dummy' AND b.ds = 'dummy' AND a.c = b.c POSTHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/implicit_cast1.q.out b/ql/src/test/results/clientpositive/implicit_cast1.q.out index b451a63..de9f632 100644 --- a/ql/src/test/results/clientpositive/implicit_cast1.q.out +++ b/ql/src/test/results/clientpositive/implicit_cast1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE implicit_test1(a BIGINT, b STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe' WITH SERDEPROPERTIES('serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol') STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE implicit_test1(a BIGINT, b STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe' WITH SERDEPROPERTIES('serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol') STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@implicit_test1 PREHOOK: query: EXPLAIN SELECT implicit_test1.* diff --git a/ql/src/test/results/clientpositive/index_auth.q.out b/ql/src/test/results/clientpositive/index_auth.q.out index 2973eb3..f3c4c55 100644 --- a/ql/src/test/results/clientpositive/index_auth.q.out +++ b/ql/src/test/results/clientpositive/index_auth.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table foobar(key int, value string) PARTITIONED BY (ds string, hr string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table foobar(key int, value string) PARTITIONED BY (ds string, hr string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@foobar PREHOOK: query: alter table foobar add partition (ds='2008-04-08',hr='12') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@foobar +PREHOOK: Output: default@foobar POSTHOOK: query: alter table foobar add partition (ds='2008-04-08',hr='12') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@foobar +POSTHOOK: Output: default@foobar POSTHOOK: Output: default@foobar@ds=2008-04-08/hr=12 PREHOOK: query: CREATE INDEX srcpart_auth_index ON TABLE foobar(key) as 'BITMAP' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX diff --git a/ql/src/test/results/clientpositive/index_auto_empty.q.out b/ql/src/test/results/clientpositive/index_auto_empty.q.out index 6f2d517..5a7e9d8 100644 --- a/ql/src/test/results/clientpositive/index_auto_empty.q.out +++ b/ql/src/test/results/clientpositive/index_auto_empty.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Test to ensure that an empty index result is propagated corre -- Create temp, and populate it with some values in src. CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test to ensure that an empty index result is propagated correctly -- Create temp, and populate it with some values in src. CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@temp PREHOOK: query: -- Build an index on temp. CREATE INDEX temp_index ON TABLE temp(key) as 'COMPACT' WITH DEFERRED REBUILD diff --git a/ql/src/test/results/clientpositive/index_auto_update.q.out b/ql/src/test/results/clientpositive/index_auto_update.q.out index 5360b86..a747045 100644 --- a/ql/src/test/results/clientpositive/index_auto_update.q.out +++ b/ql/src/test/results/clientpositive/index_auto_update.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Test if index is actually being used. -- Create temp, and populate it with some values in src. CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test if index is actually being used. -- Create temp, and populate it with some values in src. CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@temp PREHOOK: query: INSERT OVERWRITE TABLE temp SELECT * FROM src WHERE key < 50 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/index_bitmap_rc.q.out b/ql/src/test/results/clientpositive/index_bitmap_rc.q.out index 9f8657f..2709ad6 100644 --- a/ql/src/test/results/clientpositive/index_bitmap_rc.q.out +++ b/ql/src/test/results/clientpositive/index_bitmap_rc.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_rc PREHOOK: query: INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-08', hr=11) SELECT key, value FROM srcpart WHERE ds = '2008-04-08' AND hr = 11 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/index_compact_2.q.out b/ql/src/test/results/clientpositive/index_compact_2.q.out index 6cde30d..dee36d0 100644 --- a/ql/src/test/results/clientpositive/index_compact_2.q.out +++ b/ql/src/test/results/clientpositive/index_compact_2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_rc PREHOOK: query: INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-08', hr=11) SELECT key, value FROM srcpart WHERE ds = '2008-04-08' AND hr = 11 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/index_compact_3.q.out b/ql/src/test/results/clientpositive/index_compact_3.q.out index 55457ce..784c635 100644 --- a/ql/src/test/results/clientpositive/index_compact_3.q.out +++ b/ql/src/test/results/clientpositive/index_compact_3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE src_index_test_rc (key int, value string) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_index_test_rc (key int, value string) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_index_test_rc PREHOOK: query: INSERT OVERWRITE TABLE src_index_test_rc SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/index_creation.q.out b/ql/src/test/results/clientpositive/index_creation.q.out index fbca8d3..cd8d11e 100644 --- a/ql/src/test/results/clientpositive/index_creation.q.out +++ b/ql/src/test/results/clientpositive/index_creation.q.out @@ -148,8 +148,10 @@ _offsets array #### A masked pattern was here #### PREHOOK: query: create table `_t`(`_i` int, `_j` int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table `_t`(`_i` int, `_j` int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@_t PREHOOK: query: create index x on table `_t`(`_j`) as 'compact' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX diff --git a/ql/src/test/results/clientpositive/index_serde.q.out b/ql/src/test/results/clientpositive/index_serde.q.out index 75cca00..cf18225 100644 --- a/ql/src/test/results/clientpositive/index_serde.q.out +++ b/ql/src/test/results/clientpositive/index_serde.q.out @@ -29,6 +29,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Want to ensure we can build and use indices on tables stored with SerDes -- Build the (Avro backed) table CREATE TABLE doctors @@ -60,6 +61,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@doctors PREHOOK: query: DESCRIBE doctors PREHOOK: type: DESCTABLE @@ -70,9 +72,11 @@ first_name string from deserializer last_name string from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@doctors POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@doctors PREHOOK: query: -- Create and build an index CREATE INDEX doctors_index ON TABLE doctors(number) AS 'COMPACT' WITH DEFERRED REBUILD diff --git a/ql/src/test/results/clientpositive/index_stale.q.out b/ql/src/test/results/clientpositive/index_stale.q.out index 169d3fa..58dc871 100644 --- a/ql/src/test/results/clientpositive/index_stale.q.out +++ b/ql/src/test/results/clientpositive/index_stale.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- test that stale indexes are not used CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test that stale indexes are not used CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@temp PREHOOK: query: INSERT OVERWRITE TABLE temp SELECT * FROM src WHERE key < 50 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/index_stale_partitioned.q.out b/ql/src/test/results/clientpositive/index_stale_partitioned.q.out index 5cff8a6..f7fbf7e 100644 --- a/ql/src/test/results/clientpositive/index_stale_partitioned.q.out +++ b/ql/src/test/results/clientpositive/index_stale_partitioned.q.out @@ -3,18 +3,20 @@ PREHOOK: query: -- Test if index is actually being used. -- Create temp, and populate it with some values in src. CREATE TABLE temp(key STRING, val STRING) PARTITIONED BY (foo string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test if index is actually being used. -- Create temp, and populate it with some values in src. CREATE TABLE temp(key STRING, val STRING) PARTITIONED BY (foo string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@temp PREHOOK: query: ALTER TABLE temp ADD PARTITION (foo = 'bar') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@temp +PREHOOK: Output: default@temp POSTHOOK: query: ALTER TABLE temp ADD PARTITION (foo = 'bar') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@temp +POSTHOOK: Output: default@temp POSTHOOK: Output: default@temp@foo=bar PREHOOK: query: INSERT OVERWRITE TABLE temp PARTITION (foo = 'bar') SELECT * FROM src WHERE key < 50 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out index 4cf8242..fbb8837 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- This tests inferring how data is bucketed/sorted from the ope CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests inferring how data is bucketed/sorted from the operators in the reducer -- and populating that information in partitions' metadata CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: -- Test group by, should be bucketed and sorted by group by key INSERT OVERWRITE TABLE test_table PARTITION (part = '1') diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out index fdc9f23..8659da5 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Test writing to a bucketed table, the output should be bucket CREATE TABLE test_table_bucketed (key STRING, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (value) SORTED BY (value) INTO 3 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test writing to a bucketed table, the output should be bucketed by the bucketing key into the -- a number of files equal to the number of buckets CREATE TABLE test_table_bucketed (key STRING, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (value) SORTED BY (value) INTO 3 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table_bucketed PREHOOK: query: -- Despite the fact that normally inferring would say this table is bucketed and sorted on key, -- this should be bucketed and sorted by value into 3 buckets diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out index 8cdbad3..60b41f0 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out @@ -4,12 +4,14 @@ PREHOOK: query: -- This tests inferring how data is bucketed/sorted from the ope CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests inferring how data is bucketed/sorted from the operators in the reducer -- and populating that information in partitions' metadata. In particular, those cases -- where joins may be auto converted to map joins. CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: -- Tests a join which is converted to a map join, the output should be neither bucketed nor sorted INSERT OVERWRITE TABLE test_table PARTITION (part = '1') diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out index 10040b0..4cce425 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out @@ -4,12 +4,14 @@ PREHOOK: query: -- This tests inferring how data is bucketed/sorted from the ope CREATE TABLE test_table LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests inferring how data is bucketed/sorted from the operators in the reducer -- and populating that information in partitions' metadata. In particular, those cases -- where dynamic partitioning is used. CREATE TABLE test_table LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: ALTER TABLE test_table SET FILEFORMAT RCFILE PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -404,8 +406,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: CREATE TABLE srcpart_merge_dp LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcpart_merge_dp LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] @@ -421,8 +425,10 @@ POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).value EXPRESSION [(srcpart)srcpart.null, ] PREHOOK: query: CREATE TABLE srcpart_merge_dp_rc LIKE srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcpart_merge_dp_rc LIKE srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_merge_dp_rc POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] @@ -458,9 +464,11 @@ POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).value EXPRESSION [(srcpart)srcpart.null, ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] @@ -477,9 +485,11 @@ POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).value EXPRESSION [(srcpart)srcpart.null, ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] @@ -495,9 +505,11 @@ POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).value EXPRESSION [(srcpart)srcpart.null, ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] @@ -513,9 +525,11 @@ POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).value EXPRESSION [(srcpart)srcpart.null, ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] @@ -531,9 +545,11 @@ POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=12).value EXPRESSION [(srcpart)srcpart.null, ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp PARTITION(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out index 2bae6a8..90dfe92 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out @@ -4,17 +4,21 @@ PREHOOK: query: -- This tests inferring how data is bucketed/sorted from the ope CREATE TABLE test_table_out (key STRING, value STRING, agg STRING) PARTITIONED BY (part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests inferring how data is bucketed/sorted from the operators in the reducer -- and populating that information in partitions' metadata, in particular, this tests -- the grouping operators rollup/cube/grouping sets CREATE TABLE test_table_out (key STRING, value STRING, agg STRING) PARTITIONED BY (part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table_out PREHOOK: query: CREATE TABLE test_table_out_2 (key STRING, value STRING, grouping_key STRING, agg STRING) PARTITIONED BY (part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table_out_2 (key STRING, value STRING, grouping_key STRING, agg STRING) PARTITIONED BY (part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table_out_2 PREHOOK: query: -- Test rollup, should not be bucketed or sorted because its missing the grouping ID EXPLAIN INSERT OVERWRITE TABLE test_table_out PARTITION (part = '1') diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out index 6717784..2c23c39 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out @@ -5,6 +5,7 @@ PREHOOK: query: -- This tests inferring how data is bucketed/sorted from the ope CREATE TABLE test_table1 (key STRING, value STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests inferring how data is bucketed/sorted from the operators in the reducer -- and populating that information in partitions' metadata, in particular, this tests -- that operators in the mapper have no effect @@ -12,13 +13,16 @@ POSTHOOK: query: -- This tests inferring how data is bucketed/sorted from the op CREATE TABLE test_table1 (key STRING, value STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key STRING, value STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key STRING, value STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: INSERT OVERWRITE TABLE test_table1 SELECT key, value FROM src PREHOOK: type: QUERY @@ -44,8 +48,10 @@ POSTHOOK: Lineage: test_table2.key SIMPLE [(src)src.FieldSchema(name:key, type:s POSTHOOK: Lineage: test_table2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE test_table_out (key STRING, value STRING) PARTITIONED BY (part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table_out (key STRING, value STRING) PARTITIONED BY (part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table_out POSTHOOK: Lineage: test_table1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out index 4e34162..9ac009e 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out @@ -4,12 +4,14 @@ PREHOOK: query: -- This tests inferring how data is bucketed/sorted from the ope CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests inferring how data is bucketed/sorted from the operators in the reducer -- and populating that information in partitions' metadata. In particular, those cases -- where where merging may or may not be used. CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: -- Tests a reduce task followed by a merge. The output should be neither bucketed nor sorted. INSERT OVERWRITE TABLE test_table PARTITION (part = '1') diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out index fae87c4..792ecde 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out @@ -4,12 +4,14 @@ PREHOOK: query: -- This tests inferring how data is bucketed/sorted from the ope CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests inferring how data is bucketed/sorted from the operators in the reducer -- and populating that information in partitions' metadata. In particular, those cases -- where multi insert is used. CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: -- Simple case, neither partition should be bucketed or sorted diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out index 7c1ad28..256fca0 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE test_table (key INT, value STRING) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table (key INT, value STRING) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: -- Tests dynamic partitions where bucketing/sorting can be inferred, but not all reducers write -- all partitions. The subquery produces rows as follows diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out index 56a832d..39a1161 100644 --- a/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out +++ b/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out @@ -4,12 +4,14 @@ PREHOOK: query: -- This tests inferring how data is bucketed/sorted from the ope CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests inferring how data is bucketed/sorted from the operators in the reducer -- and populating that information in partitions' metadata, it also verifies that the -- number of reducers chosen will be a power of two CREATE TABLE test_table (key STRING, value STRING) PARTITIONED BY (part STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: -- Test group by, should be bucketed and sorted by group by key INSERT OVERWRITE TABLE test_table PARTITION (part = '1') diff --git a/ql/src/test/results/clientpositive/infer_const_type.q.out b/ql/src/test/results/clientpositive/infer_const_type.q.out index 052b77e..b6f74be 100644 --- a/ql/src/test/results/clientpositive/infer_const_type.q.out +++ b/ql/src/test/results/clientpositive/infer_const_type.q.out @@ -4,14 +4,18 @@ POSTHOOK: query: DROP TABLE infertypes POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE infertypes(ti TINYINT, si SMALLINT, i INT, bi BIGINT, fl FLOAT, db DOUBLE, str STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE infertypes(ti TINYINT, si SMALLINT, i INT, bi BIGINT, fl FLOAT, db DOUBLE, str STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@infertypes PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/infer_const_type.txt' OVERWRITE INTO TABLE infertypes PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@infertypes POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/infer_const_type.txt' OVERWRITE INTO TABLE infertypes POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@infertypes PREHOOK: query: SELECT * FROM infertypes PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/init_file.q.out b/ql/src/test/results/clientpositive/init_file.q.out index 6b47252..7a37646 100644 --- a/ql/src/test/results/clientpositive/init_file.q.out +++ b/ql/src/test/results/clientpositive/init_file.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tbl_created_by_init(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_created_by_init(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_created_by_init PREHOOK: query: -- tbl_created_by_init is supposed to have been created for us -- automatically by test_init_file.sql diff --git a/ql/src/test/results/clientpositive/innerjoin.q.out b/ql/src/test/results/clientpositive/innerjoin.q.out index 3cd4a15..62b9586 100644 --- a/ql/src/test/results/clientpositive/innerjoin.q.out +++ b/ql/src/test/results/clientpositive/innerjoin.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: EXPLAIN FROM src src1 INNER JOIN src src2 ON (src1.key = src2.key) @@ -1150,9 +1152,11 @@ POSTHOOK: Lineage: dest_j1.value SIMPLE [(src)src2.FieldSchema(name:value, type: PREHOOK: query: -- verify that INNER is a non-reserved word for backwards compatibility create table inner(i int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- verify that INNER is a non-reserved word for backwards compatibility create table inner(i int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inner POSTHOOK: Lineage: dest_j1.key EXPRESSION [(src)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest_j1.value SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ] @@ -1168,8 +1172,10 @@ POSTHOOK: Lineage: dest_j1.key EXPRESSION [(src)src1.FieldSchema(name:key, type: POSTHOOK: Lineage: dest_j1.value SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table i(inner int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table i(inner int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@i POSTHOOK: Lineage: dest_j1.key EXPRESSION [(src)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest_j1.value SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/inoutdriver.q.out b/ql/src/test/results/clientpositive/inoutdriver.q.out index dbfd7d8..3fc01ef 100644 --- a/ql/src/test/results/clientpositive/inoutdriver.q.out +++ b/ql/src/test/results/clientpositive/inoutdriver.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table test (a int) stored as inputformat 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' outputformat 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' inputdriver 'RCFileInDriver' outputdriver 'RCFileOutDriver' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test (a int) stored as inputformat 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' outputformat 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' inputdriver 'RCFileInDriver' outputdriver 'RCFileOutDriver' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test PREHOOK: query: desc extended test PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/input1.q.out b/ql/src/test/results/clientpositive/input1.q.out index adeeaf8..af975f0 100644 --- a/ql/src/test/results/clientpositive/input1.q.out +++ b/ql/src/test/results/clientpositive/input1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE TEST1(A INT, B DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TEST1(A INT, B DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TEST1 PREHOOK: query: EXPLAIN DESCRIBE TEST1 diff --git a/ql/src/test/results/clientpositive/input10.q.out b/ql/src/test/results/clientpositive/input10.q.out index 4a2b785..abdb2d1 100644 --- a/ql/src/test/results/clientpositive/input10.q.out +++ b/ql/src/test/results/clientpositive/input10.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE TEST10(key INT, value STRING) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TEST10(key INT, value STRING) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TEST10 PREHOOK: query: EXPLAIN DESCRIBE TEST10 diff --git a/ql/src/test/results/clientpositive/input11.q.out b/ql/src/test/results/clientpositive/input11.q.out index f65891c..3e30e3a 100644 --- a/ql/src/test/results/clientpositive/input11.q.out +++ b/ql/src/test/results/clientpositive/input11.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/input11_limit.q.out b/ql/src/test/results/clientpositive/input11_limit.q.out index 6970a07..967dc31 100644 --- a/ql/src/test/results/clientpositive/input11_limit.q.out +++ b/ql/src/test/results/clientpositive/input11_limit.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/input12_hadoop20.q.out b/ql/src/test/results/clientpositive/input12_hadoop20.q.out index 06c5d55..3ba946d 100644 --- a/ql/src/test/results/clientpositive/input12_hadoop20.q.out +++ b/ql/src/test/results/clientpositive/input12_hadoop20.q.out @@ -2,20 +2,26 @@ PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 PREHOOK: query: CREATE TABLE dest3(key INT) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest3(key INT) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest3 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/input13.q.out b/ql/src/test/results/clientpositive/input13.q.out index 4824819..204f7e6 100644 --- a/ql/src/test/results/clientpositive/input13.q.out +++ b/ql/src/test/results/clientpositive/input13.q.out @@ -1,17 +1,23 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 PREHOOK: query: CREATE TABLE dest3(key INT) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest3(key INT) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest3 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/input14.q.out b/ql/src/test/results/clientpositive/input14.q.out index 96f937c..f7ec1df 100644 --- a/ql/src/test/results/clientpositive/input14.q.out +++ b/ql/src/test/results/clientpositive/input14.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input14_limit.q.out b/ql/src/test/results/clientpositive/input14_limit.q.out index 59435ad..15268d9 100644 --- a/ql/src/test/results/clientpositive/input14_limit.q.out +++ b/ql/src/test/results/clientpositive/input14_limit.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input15.q.out b/ql/src/test/results/clientpositive/input15.q.out index ce129f7..6008a14 100644 --- a/ql/src/test/results/clientpositive/input15.q.out +++ b/ql/src/test/results/clientpositive/input15.q.out @@ -19,8 +19,10 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE TEST15(key INT, value STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TEST15(key INT, value STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TEST15 PREHOOK: query: DESCRIBE TEST15 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/input16.q.out b/ql/src/test/results/clientpositive/input16.q.out index abd691e..d45fab3 100644 --- a/ql/src/test/results/clientpositive/input16.q.out +++ b/ql/src/test/results/clientpositive/input16.q.out @@ -6,14 +6,18 @@ DROP TABLE INPUT16 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE INPUT16(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUT16(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUT16 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1_cb.txt' INTO TABLE INPUT16 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@input16 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1_cb.txt' INTO TABLE INPUT16 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@input16 PREHOOK: query: SELECT INPUT16.VALUE, INPUT16.KEY FROM INPUT16 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/input16_cc.q.out b/ql/src/test/results/clientpositive/input16_cc.q.out index cd35507..ad32bac 100644 --- a/ql/src/test/results/clientpositive/input16_cc.q.out +++ b/ql/src/test/results/clientpositive/input16_cc.q.out @@ -10,14 +10,18 @@ DROP TABLE INPUT16_CC POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE INPUT16_CC(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' with serdeproperties ('testserde.default.serialization.format'='\003', 'dummy.prop.not.used'='dummyy.val') STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUT16_CC(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' with serdeproperties ('testserde.default.serialization.format'='\003', 'dummy.prop.not.used'='dummyy.val') STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUT16_CC PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1_cc.txt' INTO TABLE INPUT16_CC PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@input16_cc POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1_cc.txt' INTO TABLE INPUT16_CC POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@input16_cc PREHOOK: query: SELECT INPUT16_CC.VALUE, INPUT16_CC.KEY FROM INPUT16_CC PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/input17.q.out b/ql/src/test/results/clientpositive/input17.q.out index 30f989e..32f2a28 100644 --- a/ql/src/test/results/clientpositive/input17.q.out +++ b/ql/src/test/results/clientpositive/input17.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input18.q.out b/ql/src/test/results/clientpositive/input18.q.out index 6125a0c..30a37b5 100644 --- a/ql/src/test/results/clientpositive/input18.q.out +++ b/ql/src/test/results/clientpositive/input18.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input19.q.out b/ql/src/test/results/clientpositive/input19.q.out index fb57bc7..5394e42 100644 --- a/ql/src/test/results/clientpositive/input19.q.out +++ b/ql/src/test/results/clientpositive/input19.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table apachelog(ipaddress STRING,identd STRING,user_name STRING,finishtime STRING,requestline string,returncode INT,size INT) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe' WITH SERDEPROPERTIES ( 'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol', 'quote.delim'= '("|\\[|\\])', 'field.delim'=' ', 'serialization.null.format'='-' ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table apachelog(ipaddress STRING,identd STRING,user_name STRING,finishtime STRING,requestline string,returncode INT,size INT) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe' WITH SERDEPROPERTIES ( 'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol', 'quote.delim'= '("|\\[|\\])', 'field.delim'=' ', 'serialization.null.format'='-' ) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@apachelog PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/apache.access.log' INTO TABLE apachelog PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@apachelog POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/apache.access.log' INTO TABLE apachelog POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@apachelog PREHOOK: query: SELECT a.* FROM apachelog a PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/input1_limit.q.out b/ql/src/test/results/clientpositive/input1_limit.q.out index 5ec6d83..114d798 100644 --- a/ql/src/test/results/clientpositive/input1_limit.q.out +++ b/ql/src/test/results/clientpositive/input1_limit.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/input2.q.out b/ql/src/test/results/clientpositive/input2.q.out index 933665f..89ceefe 100644 --- a/ql/src/test/results/clientpositive/input2.q.out +++ b/ql/src/test/results/clientpositive/input2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE TEST2a(A INT, B DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TEST2a(A INT, B DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TEST2a PREHOOK: query: DESCRIBE TEST2a PREHOOK: type: DESCTABLE @@ -17,8 +19,10 @@ a int None b double None PREHOOK: query: CREATE TABLE TEST2b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TEST2b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TEST2b PREHOOK: query: DESCRIBE TEST2b PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/input20.q.out b/ql/src/test/results/clientpositive/input20.q.out index 80c32fd..e6352fb 100644 --- a/ql/src/test/results/clientpositive/input20.q.out +++ b/ql/src/test/results/clientpositive/input20.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input21.q.out b/ql/src/test/results/clientpositive/input21.q.out index 9715818..3de6fff 100644 --- a/ql/src/test/results/clientpositive/input21.q.out +++ b/ql/src/test/results/clientpositive/input21.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE src_null(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_null(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_null PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE src_null PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_null POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE src_null POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_null PREHOOK: query: EXPLAIN SELECT * FROM src_null DISTRIBUTE BY c SORT BY d PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/input22.q.out b/ql/src/test/results/clientpositive/input22.q.out index ba69e50..ee42169 100644 --- a/ql/src/test/results/clientpositive/input22.q.out +++ b/ql/src/test/results/clientpositive/input22.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE INPUT4(KEY STRING, VALUE STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUT4(KEY STRING, VALUE STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUT4 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUT4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@input4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUT4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@input4 PREHOOK: query: EXPLAIN SELECT a.KEY2 diff --git a/ql/src/test/results/clientpositive/input24.q.out b/ql/src/test/results/clientpositive/input24.q.out index c09f4f5..6611987 100644 --- a/ql/src/test/results/clientpositive/input24.q.out +++ b/ql/src/test/results/clientpositive/input24.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table tst(a int, b int) partitioned by (d string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst(a int, b int) partitioned by (d string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst PREHOOK: query: alter table tst add partition (d='2009-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tst +PREHOOK: Output: default@tst POSTHOOK: query: alter table tst add partition (d='2009-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tst +POSTHOOK: Output: default@tst POSTHOOK: Output: default@tst@d=2009-01-01 PREHOOK: query: explain select count(1) from tst x where x.d='2009-01-01' diff --git a/ql/src/test/results/clientpositive/input25.q.out b/ql/src/test/results/clientpositive/input25.q.out index 657bbb5..8e23334 100644 --- a/ql/src/test/results/clientpositive/input25.q.out +++ b/ql/src/test/results/clientpositive/input25.q.out @@ -1,21 +1,23 @@ PREHOOK: query: create table tst(a int, b int) partitioned by (d string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst(a int, b int) partitioned by (d string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst PREHOOK: query: alter table tst add partition (d='2009-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tst +PREHOOK: Output: default@tst POSTHOOK: query: alter table tst add partition (d='2009-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tst +POSTHOOK: Output: default@tst POSTHOOK: Output: default@tst@d=2009-01-01 PREHOOK: query: alter table tst add partition (d='2009-02-02') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tst +PREHOOK: Output: default@tst POSTHOOK: query: alter table tst add partition (d='2009-02-02') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tst +POSTHOOK: Output: default@tst POSTHOOK: Output: default@tst@d=2009-02-02 PREHOOK: query: explain select * from ( diff --git a/ql/src/test/results/clientpositive/input28.q.out b/ql/src/test/results/clientpositive/input28.q.out index 51a1853..ab0c3bb 100644 --- a/ql/src/test/results/clientpositive/input28.q.out +++ b/ql/src/test/results/clientpositive/input28.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table tst(a string, b string) partitioned by (d string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst(a string, b string) partitioned by (d string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst PREHOOK: query: alter table tst add partition (d='2009-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tst +PREHOOK: Output: default@tst POSTHOOK: query: alter table tst add partition (d='2009-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tst +POSTHOOK: Output: default@tst POSTHOOK: Output: default@tst@d=2009-01-01 PREHOOK: query: insert overwrite table tst partition(d='2009-01-01') select tst.a, src.value from tst join src ON (tst.a = src.key) diff --git a/ql/src/test/results/clientpositive/input3.q.out b/ql/src/test/results/clientpositive/input3.q.out index 69a7d33..7ea0343 100644 --- a/ql/src/test/results/clientpositive/input3.q.out +++ b/ql/src/test/results/clientpositive/input3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE TEST3a(A INT, B DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TEST3a(A INT, B DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TEST3a PREHOOK: query: DESCRIBE TEST3a PREHOOK: type: DESCTABLE @@ -11,8 +13,10 @@ a int None b double None PREHOOK: query: CREATE TABLE TEST3b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TEST3b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TEST3b PREHOOK: query: DESCRIBE TEST3b PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/input30.q.out b/ql/src/test/results/clientpositive/input30.q.out index 4deb400..ea4f3df 100644 --- a/ql/src/test/results/clientpositive/input30.q.out +++ b/ql/src/test/results/clientpositive/input30.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table dest30(a int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest30(a int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest30 PREHOOK: query: create table tst_dest30(a int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst_dest30(a int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst_dest30 PREHOOK: query: explain insert overwrite table dest30 diff --git a/ql/src/test/results/clientpositive/input31.q.out b/ql/src/test/results/clientpositive/input31.q.out index 4af7681..efcbf22 100644 --- a/ql/src/test/results/clientpositive/input31.q.out +++ b/ql/src/test/results/clientpositive/input31.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table tst_dest31(a int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst_dest31(a int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst_dest31 PREHOOK: query: create table dest31(a int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest31(a int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest31 PREHOOK: query: explain insert overwrite table dest31 diff --git a/ql/src/test/results/clientpositive/input32.q.out b/ql/src/test/results/clientpositive/input32.q.out index 1c859f7..e394891 100644 --- a/ql/src/test/results/clientpositive/input32.q.out +++ b/ql/src/test/results/clientpositive/input32.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table dest32(a int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest32(a int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest32 PREHOOK: query: create table tst_dest32(a int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst_dest32(a int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst_dest32 PREHOOK: query: explain insert overwrite table dest32 diff --git a/ql/src/test/results/clientpositive/input33.q.out b/ql/src/test/results/clientpositive/input33.q.out index 5adc052..746d3be 100644 --- a/ql/src/test/results/clientpositive/input33.q.out +++ b/ql/src/test/results/clientpositive/input33.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input34.q.out b/ql/src/test/results/clientpositive/input34.q.out index bfe819c..c67b8b2 100644 --- a/ql/src/test/results/clientpositive/input34.q.out +++ b/ql/src/test/results/clientpositive/input34.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input35.q.out b/ql/src/test/results/clientpositive/input35.q.out index 84dff36..5a172a8 100644 --- a/ql/src/test/results/clientpositive/input35.q.out +++ b/ql/src/test/results/clientpositive/input35.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input36.q.out b/ql/src/test/results/clientpositive/input36.q.out index 585eb31..5155bf6 100644 --- a/ql/src/test/results/clientpositive/input36.q.out +++ b/ql/src/test/results/clientpositive/input36.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input37.q.out b/ql/src/test/results/clientpositive/input37.q.out index 9c5e70d..ccdc38f 100644 --- a/ql/src/test/results/clientpositive/input37.q.out +++ b/ql/src/test/results/clientpositive/input37.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table documents(contents string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table documents(contents string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@documents PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/docurl.txt' INTO TABLE documents PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@documents POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/docurl.txt' INTO TABLE documents POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@documents PREHOOK: query: select url, count(1) FROM diff --git a/ql/src/test/results/clientpositive/input38.q.out b/ql/src/test/results/clientpositive/input38.q.out index 048b800..cbd3c22 100644 --- a/ql/src/test/results/clientpositive/input38.q.out +++ b/ql/src/test/results/clientpositive/input38.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input39_hadoop20.q.out b/ql/src/test/results/clientpositive/input39_hadoop20.q.out index 3ef4ce6..32077d9 100644 --- a/ql/src/test/results/clientpositive/input39_hadoop20.q.out +++ b/ql/src/test/results/clientpositive/input39_hadoop20.q.out @@ -3,16 +3,20 @@ PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) create table t1(key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) create table t1(key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create table t2(key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t2(key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t2 PREHOOK: query: insert overwrite table t1 partition (ds='1') select key, value from src diff --git a/ql/src/test/results/clientpositive/input3_limit.q.out b/ql/src/test/results/clientpositive/input3_limit.q.out index 0401325..afcd5c7 100644 --- a/ql/src/test/results/clientpositive/input3_limit.q.out +++ b/ql/src/test/results/clientpositive/input3_limit.q.out @@ -1,24 +1,32 @@ PREHOOK: query: CREATE TABLE T1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv2.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv2.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE T2 SELECT * FROM (SELECT * FROM T1 DISTRIBUTE BY key SORT BY key, value) T LIMIT 20 diff --git a/ql/src/test/results/clientpositive/input4.q.out b/ql/src/test/results/clientpositive/input4.q.out index 52d4902..9b169f9 100644 --- a/ql/src/test/results/clientpositive/input4.q.out +++ b/ql/src/test/results/clientpositive/input4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE INPUT4(KEY STRING, VALUE STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUT4(KEY STRING, VALUE STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUT4 PREHOOK: query: EXPLAIN LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUT4 @@ -34,9 +36,11 @@ STAGE PLANS: PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUT4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@input4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUT4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@input4 PREHOOK: query: EXPLAIN FORMATTED SELECT Input4Alias.VALUE, Input4Alias.KEY FROM INPUT4 AS Input4Alias diff --git a/ql/src/test/results/clientpositive/input40.q.out b/ql/src/test/results/clientpositive/input40.q.out index f6213ec..8146021 100644 --- a/ql/src/test/results/clientpositive/input40.q.out +++ b/ql/src/test/results/clientpositive/input40.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table tmp_insert_test (key string, value string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp_insert_test (key string, value string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_insert_test PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table tmp_insert_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmp_insert_test POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table tmp_insert_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmp_insert_test PREHOOK: query: select * from tmp_insert_test PREHOOK: type: QUERY @@ -519,14 +523,18 @@ POSTHOOK: Input: default@tmp_insert_test 97 val_97 PREHOOK: query: create table tmp_insert_test_p (key string, value string) partitioned by (ds string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp_insert_test_p (key string, value string) partitioned by (ds string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_insert_test_p PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table tmp_insert_test_p partition (ds = '2009-08-01') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmp_insert_test_p POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table tmp_insert_test_p partition (ds = '2009-08-01') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmp_insert_test_p POSTHOOK: Output: default@tmp_insert_test_p@ds=2009-08-01 PREHOOK: query: select * from tmp_insert_test_p where ds= '2009-08-01' @@ -1043,9 +1051,11 @@ POSTHOOK: Input: default@tmp_insert_test_p@ds=2009-08-01 98 val_98 2009-08-01 PREHOOK: query: load data local inpath '../../data/files/kv2.txt' into table tmp_insert_test_p partition (ds = '2009-08-01') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmp_insert_test_p@ds=2009-08-01 POSTHOOK: query: load data local inpath '../../data/files/kv2.txt' into table tmp_insert_test_p partition (ds = '2009-08-01') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmp_insert_test_p@ds=2009-08-01 PREHOOK: query: select * from tmp_insert_test_p where ds= '2009-08-01' order by key, value diff --git a/ql/src/test/results/clientpositive/input41.q.out b/ql/src/test/results/clientpositive/input41.q.out index 6c0c6ac..ae5eb5a 100644 --- a/ql/src/test/results/clientpositive/input41.q.out +++ b/ql/src/test/results/clientpositive/input41.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table dest_sp (cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest_sp (cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_sp PREHOOK: query: insert overwrite table dest_sp select * from diff --git a/ql/src/test/results/clientpositive/input43.q.out b/ql/src/test/results/clientpositive/input43.q.out index c7d2c5a..ed90c2e 100644 --- a/ql/src/test/results/clientpositive/input43.q.out +++ b/ql/src/test/results/clientpositive/input43.q.out @@ -4,14 +4,18 @@ POSTHOOK: query: drop table tst_src1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tst_src1 like src1 PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst_src1 like src1 POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst_src1 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table tst_src1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tst_src1 POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table tst_src1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tst_src1 PREHOOK: query: select count(1) from tst_src1 PREHOOK: type: QUERY @@ -24,9 +28,11 @@ POSTHOOK: Input: default@tst_src1 500 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table tst_src1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tst_src1 POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table tst_src1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tst_src1 PREHOOK: query: select count(1) from tst_src1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/input44.q.out b/ql/src/test/results/clientpositive/input44.q.out index af9c9ef..d3b3df7 100644 --- a/ql/src/test/results/clientpositive/input44.q.out +++ b/ql/src/test/results/clientpositive/input44.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest PREHOOK: query: INSERT OVERWRITE TABLE dest SELECT src.* FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/input46.q.out b/ql/src/test/results/clientpositive/input46.q.out index 8c49197..a891362 100644 --- a/ql/src/test/results/clientpositive/input46.q.out +++ b/ql/src/test/results/clientpositive/input46.q.out @@ -18,13 +18,17 @@ POSTHOOK: Input: default@src POSTHOOK: Output: table_in_database_creation@test2 PREHOOK: query: create table table_in_database_creation.test3 (a string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:table_in_database_creation POSTHOOK: query: create table table_in_database_creation.test3 (a string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:table_in_database_creation POSTHOOK: Output: table_in_database_creation@test3 PREHOOK: query: create table `table_in_database_creation.test4` (a string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:table_in_database_creation POSTHOOK: query: create table `table_in_database_creation.test4` (a string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:table_in_database_creation POSTHOOK: Output: table_in_database_creation@test4 PREHOOK: query: drop database table_in_database_creation cascade PREHOOK: type: DROPDATABASE diff --git a/ql/src/test/results/clientpositive/input49.q.out b/ql/src/test/results/clientpositive/input49.q.out index 31b725f..3d2a7b6 100644 --- a/ql/src/test/results/clientpositive/input49.q.out +++ b/ql/src/test/results/clientpositive/input49.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table intable (b boolean, d double, f float, i int, l bigint, s string, t tinyint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table intable (b boolean, d double, f float, i int, l bigint, s string, t tinyint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@intable PREHOOK: query: insert overwrite table intable select 0, 29098519.0, 1410.0, 996, 40408519555, "test_string", 12 from src limit 1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/input4_cb_delim.q.out b/ql/src/test/results/clientpositive/input4_cb_delim.q.out index 4bec55c..b657f4c 100644 --- a/ql/src/test/results/clientpositive/input4_cb_delim.q.out +++ b/ql/src/test/results/clientpositive/input4_cb_delim.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE INPUT4_CB(KEY STRING, VALUE STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002' LINES TERMINATED BY '\012' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUT4_CB(KEY STRING, VALUE STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002' LINES TERMINATED BY '\012' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUT4_CB PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1_cb.txt' INTO TABLE INPUT4_CB PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@input4_cb POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1_cb.txt' INTO TABLE INPUT4_CB POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@input4_cb PREHOOK: query: SELECT INPUT4_CB.VALUE, INPUT4_CB.KEY FROM INPUT4_CB PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/input5.q.out b/ql/src/test/results/clientpositive/input5.q.out index 057354f..ea9eb5e 100644 --- a/ql/src/test/results/clientpositive/input5.q.out +++ b/ql/src/test/results/clientpositive/input5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/input6.q.out b/ql/src/test/results/clientpositive/input6.q.out index c02622c..f34a8d6 100644 --- a/ql/src/test/results/clientpositive/input6.q.out +++ b/ql/src/test/results/clientpositive/input6.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src1 diff --git a/ql/src/test/results/clientpositive/input7.q.out b/ql/src/test/results/clientpositive/input7.q.out index 60f212c..5843dbc 100644 --- a/ql/src/test/results/clientpositive/input7.q.out +++ b/ql/src/test/results/clientpositive/input7.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 DOUBLE, c2 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src1 diff --git a/ql/src/test/results/clientpositive/input8.q.out b/ql/src/test/results/clientpositive/input8.q.out index 338d605..82467d1 100644 --- a/ql/src/test/results/clientpositive/input8.q.out +++ b/ql/src/test/results/clientpositive/input8.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING, c2 INT, c3 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING, c2 INT, c3 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src1 diff --git a/ql/src/test/results/clientpositive/input9.q.out b/ql/src/test/results/clientpositive/input9.q.out index c6b51b7..c481060 100644 --- a/ql/src/test/results/clientpositive/input9.q.out +++ b/ql/src/test/results/clientpositive/input9.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(value STRING, key INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(value STRING, key INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src1 diff --git a/ql/src/test/results/clientpositive/input_columnarserde.q.out b/ql/src/test/results/clientpositive/input_columnarserde.q.out index 7e6c9b5..58ada84 100644 --- a/ql/src/test/results/clientpositive/input_columnarserde.q.out +++ b/ql/src/test/results/clientpositive/input_columnarserde.q.out @@ -5,6 +5,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE input_columnarserde(a array, b array, c map, d int, e string) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' @@ -12,6 +13,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@input_columnarserde PREHOOK: query: EXPLAIN FROM src_thrift diff --git a/ql/src/test/results/clientpositive/input_dynamicserde.q.out b/ql/src/test/results/clientpositive/input_dynamicserde.q.out index 65dc58a..3536f2e 100644 --- a/ql/src/test/results/clientpositive/input_dynamicserde.q.out +++ b/ql/src/test/results/clientpositive/input_dynamicserde.q.out @@ -6,6 +6,7 @@ MAP KEYS TERMINATED BY '3' LINES TERMINATED BY '10' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(a array, b array, c map, d int, e string) ROW FORMAT DELIMITED FIELDS TERMINATED BY '1' @@ -14,6 +15,7 @@ MAP KEYS TERMINATED BY '3' LINES TERMINATED BY '10' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src_thrift diff --git a/ql/src/test/results/clientpositive/input_lazyserde.q.out b/ql/src/test/results/clientpositive/input_lazyserde.q.out index 066374a..4c01632 100644 --- a/ql/src/test/results/clientpositive/input_lazyserde.q.out +++ b/ql/src/test/results/clientpositive/input_lazyserde.q.out @@ -6,6 +6,7 @@ MAP KEYS TERMINATED BY '3' LINES TERMINATED BY '10' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(a array, b array, c map, d int, e string) ROW FORMAT DELIMITED FIELDS TERMINATED BY '1' @@ -14,6 +15,7 @@ MAP KEYS TERMINATED BY '3' LINES TERMINATED BY '10' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src_thrift @@ -147,8 +149,10 @@ POSTHOOK: Lineage: dest1.d SIMPLE [(src_thrift)src_thrift.FieldSchema(name:aint, POSTHOOK: Lineage: dest1.e SIMPLE [(src_thrift)src_thrift.FieldSchema(name:astring, type:string, comment:from deserializer), ] PREHOOK: query: CREATE TABLE dest1(a array) ROW FORMAT DELIMITED FIELDS TERMINATED BY '1' ESCAPED BY '\\' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(a array) ROW FORMAT DELIMITED FIELDS TERMINATED BY '1' ESCAPED BY '\\' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.a SIMPLE [(src_thrift)src_thrift.FieldSchema(name:lint, type:array, comment:from deserializer), ] POSTHOOK: Lineage: dest1.b SIMPLE [(src_thrift)src_thrift.FieldSchema(name:lstring, type:array, comment:from deserializer), ] @@ -210,8 +214,10 @@ POSTHOOK: Lineage: dest1.d SIMPLE [(src_thrift)src_thrift.FieldSchema(name:aint, POSTHOOK: Lineage: dest1.e SIMPLE [(src_thrift)src_thrift.FieldSchema(name:astring, type:string, comment:from deserializer), ] PREHOOK: query: CREATE TABLE dest1(a map) ROW FORMAT DELIMITED FIELDS TERMINATED BY '1' ESCAPED BY '\\' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(a map) ROW FORMAT DELIMITED FIELDS TERMINATED BY '1' ESCAPED BY '\\' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.a SIMPLE [(src_thrift)src_thrift.FieldSchema(name:lint, type:array, comment:from deserializer), ] POSTHOOK: Lineage: dest1.a SIMPLE [(src_thrift)src_thrift.FieldSchema(name:lint, type:array, comment:from deserializer), ] diff --git a/ql/src/test/results/clientpositive/input_part1.q.out b/ql/src/test/results/clientpositive/input_part1.q.out index 4c1d89b..911b888 100644 --- a/ql/src/test/results/clientpositive/input_part1.q.out +++ b/ql/src/test/results/clientpositive/input_part1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING, hr STRING, ds STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING, hr STRING, ds STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN EXTENDED FROM srcpart diff --git a/ql/src/test/results/clientpositive/input_part10.q.out b/ql/src/test/results/clientpositive/input_part10.q.out index 4cbacca..1a7ef57 100644 --- a/ql/src/test/results/clientpositive/input_part10.q.out +++ b/ql/src/test/results/clientpositive/input_part10.q.out @@ -9,6 +9,7 @@ CREATE TABLE part_special ( ts STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- EXCLUDE_OS_WINDOWS -- excluded on windows because of difference in file name encoding logic @@ -20,6 +21,7 @@ CREATE TABLE part_special ( ts STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_special PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE part_special PARTITION(ds='2008 04 08', ts = '10:11:12=455') diff --git a/ql/src/test/results/clientpositive/input_part2.q.out b/ql/src/test/results/clientpositive/input_part2.q.out index ea22329..a278002 100644 --- a/ql/src/test/results/clientpositive/input_part2.q.out +++ b/ql/src/test/results/clientpositive/input_part2.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING, hr STRING, ds STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING, hr STRING, ds STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: CREATE TABLE dest2(key INT, value STRING, hr STRING, ds STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest2(key INT, value STRING, hr STRING, ds STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 PREHOOK: query: EXPLAIN EXTENDED FROM srcpart diff --git a/ql/src/test/results/clientpositive/input_part5.q.out b/ql/src/test/results/clientpositive/input_part5.q.out index 1499c94..5a3d908 100644 --- a/ql/src/test/results/clientpositive/input_part5.q.out +++ b/ql/src/test/results/clientpositive/input_part5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tmptable(key string, value string, hr string, ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmptable(key string, value string, hr string, ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: EXPLAIN insert overwrite table tmptable diff --git a/ql/src/test/results/clientpositive/input_testsequencefile.q.out b/ql/src/test/results/clientpositive/input_testsequencefile.q.out index 1f16ac8..1ef89e9 100644 --- a/ql/src/test/results/clientpositive/input_testsequencefile.q.out +++ b/ql/src/test/results/clientpositive/input_testsequencefile.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest4_sequencefile(key INT, value STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest4_sequencefile(key INT, value STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest4_sequencefile PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/input_testxpath.q.out b/ql/src/test/results/clientpositive/input_testxpath.q.out index 8b05375..3802ba8 100644 --- a/ql/src/test/results/clientpositive/input_testxpath.q.out +++ b/ql/src/test/results/clientpositive/input_testxpath.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING, mapvalue STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING, mapvalue STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src_thrift diff --git a/ql/src/test/results/clientpositive/input_testxpath2.q.out b/ql/src/test/results/clientpositive/input_testxpath2.q.out index 82b6edc..6226610 100644 --- a/ql/src/test/results/clientpositive/input_testxpath2.q.out +++ b/ql/src/test/results/clientpositive/input_testxpath2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(lint_size INT, lintstring_size INT, mstringstring_size INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(lint_size INT, lintstring_size INT, mstringstring_size INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src_thrift diff --git a/ql/src/test/results/clientpositive/inputddl1.q.out b/ql/src/test/results/clientpositive/inputddl1.q.out index 4dee65c..17bdd7b 100644 --- a/ql/src/test/results/clientpositive/inputddl1.q.out +++ b/ql/src/test/results/clientpositive/inputddl1.q.out @@ -18,8 +18,10 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE INPUTDDL1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUTDDL1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUTDDL1 PREHOOK: query: SELECT INPUTDDL1.* from INPUTDDL1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/inputddl2.q.out b/ql/src/test/results/clientpositive/inputddl2.q.out index b20bed8..bc40300 100644 --- a/ql/src/test/results/clientpositive/inputddl2.q.out +++ b/ql/src/test/results/clientpositive/inputddl2.q.out @@ -19,8 +19,10 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE INPUTDDL2(key INT, value STRING) PARTITIONED BY(ds STRING, country STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUTDDL2(key INT, value STRING) PARTITIONED BY(ds STRING, country STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUTDDL2 PREHOOK: query: DESCRIBE INPUTDDL2 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/inputddl3.q.out b/ql/src/test/results/clientpositive/inputddl3.q.out index afd7d74..86909c4 100644 --- a/ql/src/test/results/clientpositive/inputddl3.q.out +++ b/ql/src/test/results/clientpositive/inputddl3.q.out @@ -19,8 +19,10 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE INPUTDDL3(key INT, value STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUTDDL3(key INT, value STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUTDDL3 PREHOOK: query: DESCRIBE INPUTDDL3 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/inputddl4.q.out b/ql/src/test/results/clientpositive/inputddl4.q.out index 550e6ab..9f17601 100644 --- a/ql/src/test/results/clientpositive/inputddl4.q.out +++ b/ql/src/test/results/clientpositive/inputddl4.q.out @@ -8,6 +8,7 @@ CREATE TABLE INPUTDDL4(viewTime STRING, userid INT, PARTITIONED BY(ds STRING, country STRING) CLUSTERED BY(userid) SORTED BY(viewTime) INTO 32 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- a simple test to test sorted/clustered syntax CREATE TABLE INPUTDDL4(viewTime STRING, userid INT, @@ -18,6 +19,7 @@ CREATE TABLE INPUTDDL4(viewTime STRING, userid INT, PARTITIONED BY(ds STRING, country STRING) CLUSTERED BY(userid) SORTED BY(viewTime) INTO 32 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUTDDL4 PREHOOK: query: DESCRIBE INPUTDDL4 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/inputddl5.q.out b/ql/src/test/results/clientpositive/inputddl5.q.out index d02d72d..929c5ee 100644 --- a/ql/src/test/results/clientpositive/inputddl5.q.out +++ b/ql/src/test/results/clientpositive/inputddl5.q.out @@ -2,16 +2,20 @@ PREHOOK: query: -- test for internationalization -- kv4.txt contains the utf-8 character 0xE982B5E993AE which we are verifying later on CREATE TABLE INPUTDDL5(name STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test for internationalization -- kv4.txt contains the utf-8 character 0xE982B5E993AE which we are verifying later on CREATE TABLE INPUTDDL5(name STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUTDDL5 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv4.txt' INTO TABLE INPUTDDL5 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputddl5 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv4.txt' INTO TABLE INPUTDDL5 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputddl5 PREHOOK: query: DESCRIBE INPUTDDL5 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/inputddl6.q.out b/ql/src/test/results/clientpositive/inputddl6.q.out index 3ca50e3..ae0bc12 100644 --- a/ql/src/test/results/clientpositive/inputddl6.q.out +++ b/ql/src/test/results/clientpositive/inputddl6.q.out @@ -3,24 +3,30 @@ PREHOOK: query: -- test for describe extended table -- test for alter table drop partition CREATE TABLE INPUTDDL6(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test for describe extended table -- test for describe extended table partition -- test for alter table drop partition CREATE TABLE INPUTDDL6(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUTDDL6 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUTDDL6 PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputddl6 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUTDDL6 PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputddl6 POSTHOOK: Output: default@inputddl6@ds=2008-04-09 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUTDDL6 PARTITION (ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputddl6 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUTDDL6 PARTITION (ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputddl6 POSTHOOK: Output: default@inputddl6@ds=2008-04-08 PREHOOK: query: DESCRIBE EXTENDED INPUTDDL6 diff --git a/ql/src/test/results/clientpositive/inputddl7.q.out b/ql/src/test/results/clientpositive/inputddl7.q.out index 91fab24..7387142 100644 --- a/ql/src/test/results/clientpositive/inputddl7.q.out +++ b/ql/src/test/results/clientpositive/inputddl7.q.out @@ -4,18 +4,22 @@ PREHOOK: query: -- test for loading into tables with the correct file format CREATE TABLE T1(name STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test for loading into tables with the correct file format -- test for loading into partitions with the correct file format CREATE TABLE T1(name STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: SELECT COUNT(1) FROM T1 PREHOOK: type: QUERY @@ -28,14 +32,18 @@ POSTHOOK: Input: default@t1 500 PREHOOK: query: CREATE TABLE T2(name STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(name STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: SELECT COUNT(1) FROM T2 PREHOOK: type: QUERY @@ -48,14 +56,18 @@ POSTHOOK: Input: default@t2 500 PREHOOK: query: CREATE TABLE T3(name STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(name STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T3 PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T3 PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 POSTHOOK: Output: default@t3@ds=2008-04-09 PREHOOK: query: SELECT COUNT(1) FROM T3 where T3.ds='2008-04-09' @@ -71,14 +83,18 @@ POSTHOOK: Input: default@t3@ds=2008-04-09 500 PREHOOK: query: CREATE TABLE T4(name STRING) PARTITIONED BY(ds STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T4(name STRING) PARTITIONED BY(ds STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T4 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T4 PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T4 PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t4 POSTHOOK: Output: default@t4@ds=2008-04-09 PREHOOK: query: SELECT COUNT(1) FROM T4 where T4.ds='2008-04-09' diff --git a/ql/src/test/results/clientpositive/inputddl8.q.out b/ql/src/test/results/clientpositive/inputddl8.q.out index 78d41a1..d8e93b8 100644 --- a/ql/src/test/results/clientpositive/inputddl8.q.out +++ b/ql/src/test/results/clientpositive/inputddl8.q.out @@ -6,6 +6,7 @@ PREHOOK: query: CREATE TABLE INPUTDDL8 COMMENT 'This is a thrift based table' 'serialization.format' = 'com.facebook.thrift.protocol.TBinaryProtocol') STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE INPUTDDL8 COMMENT 'This is a thrift based table' PARTITIONED BY(ds STRING, country STRING) CLUSTERED BY(aint) SORTED BY(lint) INTO 32 BUCKETS @@ -14,6 +15,7 @@ POSTHOOK: query: CREATE TABLE INPUTDDL8 COMMENT 'This is a thrift based table' 'serialization.format' = 'com.facebook.thrift.protocol.TBinaryProtocol') STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@INPUTDDL8 PREHOOK: query: DESCRIBE EXTENDED INPUTDDL8 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/insert1.q.out b/ql/src/test/results/clientpositive/insert1.q.out index 31ceff2..17073b8 100644 --- a/ql/src/test/results/clientpositive/insert1.q.out +++ b/ql/src/test/results/clientpositive/insert1.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table insert1(key int, value string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table insert1(key int, value string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert1 PREHOOK: query: create table insert2(key int, value string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table insert2(key int, value string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert2 PREHOOK: query: insert overwrite table insert1 select a.key, a.value from insert2 a WHERE (a.key=-1) PREHOOK: type: QUERY @@ -210,8 +214,10 @@ POSTHOOK: Lineage: insert1.key SIMPLE [(insert2)a.FieldSchema(name:key, type:int POSTHOOK: Lineage: insert1.value SIMPLE [(insert2)a.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: create table x.insert1(key int, value string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:x POSTHOOK: query: create table x.insert1(key int, value string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:x POSTHOOK: Output: x@insert1 POSTHOOK: Lineage: insert1.key SIMPLE [(insert2)a.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: insert1.value SIMPLE [(insert2)a.FieldSchema(name:value, type:string, comment:null), ] @@ -584,8 +590,10 @@ POSTHOOK: Lineage: insert1.key SIMPLE [(insert2)a.FieldSchema(name:key, type:int POSTHOOK: Lineage: insert1.value SIMPLE [(insert2)a.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: CREATE TABLE result(col1 STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db2 POSTHOOK: query: CREATE TABLE result(col1 STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db2 POSTHOOK: Output: db2@result POSTHOOK: Lineage: insert1.key SIMPLE [(insert2)a.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: insert1.value SIMPLE [(insert2)a.FieldSchema(name:value, type:string, comment:null), ] @@ -644,8 +652,10 @@ POSTHOOK: Lineage: result.col1 SIMPLE [] POSTHOOK: Lineage: result.col1 SIMPLE [] PREHOOK: query: CREATE TABLE db1.result(col1 STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db1 POSTHOOK: query: CREATE TABLE db1.result(col1 STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db1 POSTHOOK: Output: db1@result POSTHOOK: Lineage: insert1.key SIMPLE [(insert2)a.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: insert1.value SIMPLE [(insert2)a.FieldSchema(name:value, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/insert1_overwrite_partitions.q.out b/ql/src/test/results/clientpositive/insert1_overwrite_partitions.q.out index 9fd1533..bf6e0ad 100644 --- a/ql/src/test/results/clientpositive/insert1_overwrite_partitions.q.out +++ b/ql/src/test/results/clientpositive/insert1_overwrite_partitions.q.out @@ -1,26 +1,34 @@ PREHOOK: query: CREATE TABLE sourceTable (one string,two string) PARTITIONED BY (ds string,hr string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE sourceTable (one string,two string) PARTITIONED BY (ds string,hr string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@sourceTable PREHOOK: query: load data local inpath '../../data/files/kv1.txt' INTO TABLE sourceTable partition(ds='2011-11-11', hr='11') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@sourcetable POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' INTO TABLE sourceTable partition(ds='2011-11-11', hr='11') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@sourcetable POSTHOOK: Output: default@sourcetable@ds=2011-11-11/hr=11 PREHOOK: query: load data local inpath '../../data/files/kv3.txt' INTO TABLE sourceTable partition(ds='2011-11-11', hr='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@sourcetable POSTHOOK: query: load data local inpath '../../data/files/kv3.txt' INTO TABLE sourceTable partition(ds='2011-11-11', hr='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@sourcetable POSTHOOK: Output: default@sourcetable@ds=2011-11-11/hr=12 PREHOOK: query: CREATE TABLE destinTable (one string,two string) PARTITIONED BY (ds string,hr string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE destinTable (one string,two string) PARTITIONED BY (ds string,hr string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@destinTable PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE destinTable PARTITION (ds='2011-11-11', hr='11') if not exists SELECT one,two FROM sourceTable WHERE ds='2011-11-11' AND hr='11' order by one desc, two desc limit 5 @@ -159,8 +167,10 @@ POSTHOOK: Lineage: destintable PARTITION(ds=2011-11-11,hr=11).one SIMPLE [(sourc POSTHOOK: Lineage: destintable PARTITION(ds=2011-11-11,hr=11).two SIMPLE [(sourcetable)sourcetable.FieldSchema(name:two, type:string, comment:null), ] PREHOOK: query: CREATE TABLE destinTable (one string,two string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE destinTable (one string,two string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@destinTable POSTHOOK: Lineage: destintable PARTITION(ds=2011-11-11,hr=11).one SIMPLE [(sourcetable)sourcetable.FieldSchema(name:one, type:string, comment:null), ] POSTHOOK: Lineage: destintable PARTITION(ds=2011-11-11,hr=11).two SIMPLE [(sourcetable)sourcetable.FieldSchema(name:two, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/insert2_overwrite_partitions.q.out b/ql/src/test/results/clientpositive/insert2_overwrite_partitions.q.out index 8df39c7..f7e8972 100644 --- a/ql/src/test/results/clientpositive/insert2_overwrite_partitions.q.out +++ b/ql/src/test/results/clientpositive/insert2_overwrite_partitions.q.out @@ -8,26 +8,34 @@ POSTHOOK: query: CREATE DATABASE db2 POSTHOOK: type: CREATEDATABASE PREHOOK: query: CREATE TABLE db1.sourceTable (one string,two string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db1 POSTHOOK: query: CREATE TABLE db1.sourceTable (one string,two string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db1 POSTHOOK: Output: db1@sourceTable PREHOOK: query: load data local inpath '../../data/files/kv1.txt' INTO TABLE db1.sourceTable partition(ds='2011-11-11') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db1@sourcetable POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' INTO TABLE db1.sourceTable partition(ds='2011-11-11') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db1@sourcetable POSTHOOK: Output: db1@sourcetable@ds=2011-11-11 PREHOOK: query: load data local inpath '../../data/files/kv3.txt' INTO TABLE db1.sourceTable partition(ds='2011-11-11') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db1@sourcetable@ds=2011-11-11 POSTHOOK: query: load data local inpath '../../data/files/kv3.txt' INTO TABLE db1.sourceTable partition(ds='2011-11-11') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db1@sourcetable@ds=2011-11-11 PREHOOK: query: CREATE TABLE db2.destinTable (one string,two string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db2 POSTHOOK: query: CREATE TABLE db2.destinTable (one string,two string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db2 POSTHOOK: Output: db2@destinTable PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE db2.destinTable PARTITION (ds='2011-11-11') SELECT one,two FROM db1.sourceTable WHERE ds='2011-11-11' order by one desc, two desc limit 5 diff --git a/ql/src/test/results/clientpositive/insert_compressed.q.out b/ql/src/test/results/clientpositive/insert_compressed.q.out index 4a161d8..83690d7 100644 --- a/ql/src/test/results/clientpositive/insert_compressed.q.out +++ b/ql/src/test/results/clientpositive/insert_compressed.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table insert_compressed POSTHOOK: type: DROPTABLE PREHOOK: query: create table insert_compressed (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table insert_compressed (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_compressed PREHOOK: query: insert overwrite table insert_compressed select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/insert_into1.q.out b/ql/src/test/results/clientpositive/insert_into1.q.out index 2709691..b068e2e 100644 --- a/ql/src/test/results/clientpositive/insert_into1.q.out +++ b/ql/src/test/results/clientpositive/insert_into1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: DROP TABLE insert_into1 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into1 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into1 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into1 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/insert_into2.q.out b/ql/src/test/results/clientpositive/insert_into2.q.out index e41fe39..b7fcdfe 100644 --- a/ql/src/test/results/clientpositive/insert_into2.q.out +++ b/ql/src/test/results/clientpositive/insert_into2.q.out @@ -5,9 +5,11 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into2 (key int, value string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into2 (key int, value string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into2 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src LIMIT 100 diff --git a/ql/src/test/results/clientpositive/insert_into3.q.out b/ql/src/test/results/clientpositive/insert_into3.q.out index c93ff1a..318c730 100644 --- a/ql/src/test/results/clientpositive/insert_into3.q.out +++ b/ql/src/test/results/clientpositive/insert_into3.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: DROP TABLE insert_into3b POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into3a (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into3a (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into3a PREHOOK: query: CREATE TABLE insert_into3b (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into3b (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into3b PREHOOK: query: EXPLAIN FROM src INSERT INTO TABLE insert_into3a SELECT * ORDER BY key, value LIMIT 50 INSERT INTO TABLE insert_into3b SELECT * ORDER BY key, value LIMIT 100 diff --git a/ql/src/test/results/clientpositive/insert_into4.q.out b/ql/src/test/results/clientpositive/insert_into4.q.out index 228b2f7..2a9a160 100644 --- a/ql/src/test/results/clientpositive/insert_into4.q.out +++ b/ql/src/test/results/clientpositive/insert_into4.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: DROP TABLE insert_into4b POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into4a (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into4a (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into4a PREHOOK: query: CREATE TABLE insert_into4b (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into4b (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into4b PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into4a SELECT * FROM src LIMIT 10 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/insert_into5.q.out b/ql/src/test/results/clientpositive/insert_into5.q.out index 34600b9..62e84a4 100644 --- a/ql/src/test/results/clientpositive/insert_into5.q.out +++ b/ql/src/test/results/clientpositive/insert_into5.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: DROP TABLE insert_into5b POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into5a (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into5a (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into5a PREHOOK: query: CREATE TABLE insert_into5b (key int, value string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into5b (key int, value string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into5b PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into5a SELECT 1, 'one' FROM src LIMIT 10 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/insert_into6.q.out b/ql/src/test/results/clientpositive/insert_into6.q.out index 07316a0..5a519d6 100644 --- a/ql/src/test/results/clientpositive/insert_into6.q.out +++ b/ql/src/test/results/clientpositive/insert_into6.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: DROP TABLE insert_into6b POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into6a (key int, value string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into6a (key int, value string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into6a PREHOOK: query: CREATE TABLE insert_into6b (key int, value string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert_into6b (key int, value string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into6b PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into6a PARTITION (ds='1') SELECT * FROM src LIMIT 150 diff --git a/ql/src/test/results/clientpositive/insert_overwrite_local_directory_1.q.out b/ql/src/test/results/clientpositive/insert_overwrite_local_directory_1.q.out index ab63e54..c7257b2 100644 --- a/ql/src/test/results/clientpositive/insert_overwrite_local_directory_1.q.out +++ b/ql/src/test/results/clientpositive/insert_overwrite_local_directory_1.q.out @@ -2,12 +2,12 @@ PREHOOK: query: insert overwrite local directory '../../data/files/local_src_tab select * from src PREHOOK: type: QUERY PREHOOK: Input: default@src -PREHOOK: Output: ../../data/files/local_src_table_1 +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_src_table_1' select * from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src -POSTHOOK: Output: ../../data/files/local_src_table_1 +#### A masked pattern was here #### 238val_238 86val_86 311val_311 @@ -514,14 +514,14 @@ FIELDS TERMINATED BY ':' select * from src PREHOOK: type: QUERY PREHOOK: Input: default@src -PREHOOK: Output: ../../data/files/local_src_table_2 +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_src_table_2' row format delimited FIELDS TERMINATED BY ':' select * from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src -POSTHOOK: Output: ../../data/files/local_src_table_2 +#### A masked pattern was here #### 238:val_238 86:val_86 311:val_311 @@ -1027,28 +1027,32 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' COLLECTION ITEMS TERMINATED BY ',' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table array_table (a array, b array) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' COLLECTION ITEMS TERMINATED BY ',' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@array_table PREHOOK: query: load data local inpath "../../data/files/array_table.txt" overwrite into table array_table PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@array_table POSTHOOK: query: load data local inpath "../../data/files/array_table.txt" overwrite into table array_table POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@array_table PREHOOK: query: insert overwrite local directory '../../data/files/local_array_table_1' select * from array_table PREHOOK: type: QUERY PREHOOK: Input: default@array_table -PREHOOK: Output: ../../data/files/local_array_table_1 +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_array_table_1' select * from array_table POSTHOOK: type: QUERY POSTHOOK: Input: default@array_table -POSTHOOK: Output: ../../data/files/local_array_table_1 +#### A masked pattern was here #### a1a2a3b1b2b3b4 a21a22a23b21b22b23b24 PREHOOK: query: insert overwrite local directory '../../data/files/local_array_table_2' @@ -1058,7 +1062,7 @@ COLLECTION ITEMS TERMINATED BY '#' select * from array_table PREHOOK: type: QUERY PREHOOK: Input: default@array_table -PREHOOK: Output: ../../data/files/local_array_table_2 +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_array_table_2' ROW FORMAT DELIMITED FIELDS TERMINATED BY ':' @@ -1066,7 +1070,7 @@ COLLECTION ITEMS TERMINATED BY '#' select * from array_table POSTHOOK: type: QUERY POSTHOOK: Input: default@array_table -POSTHOOK: Output: ../../data/files/local_array_table_2 +#### A masked pattern was here #### a1#a2#a3:b1#b2#b3#b4 a21#a22#a23:b21#b22#b23#b24 PREHOOK: query: insert overwrite local directory '../../data/files/local_array_table_2_withfields' @@ -1076,7 +1080,7 @@ COLLECTION ITEMS TERMINATED BY '#' select b,a from array_table PREHOOK: type: QUERY PREHOOK: Input: default@array_table -PREHOOK: Output: ../../data/files/local_array_table_2_withfields +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_array_table_2_withfields' ROW FORMAT DELIMITED FIELDS TERMINATED BY ':' @@ -1084,7 +1088,7 @@ COLLECTION ITEMS TERMINATED BY '#' select b,a from array_table POSTHOOK: type: QUERY POSTHOOK: Input: default@array_table -POSTHOOK: Output: ../../data/files/local_array_table_2_withfields +#### A masked pattern was here #### b1#b2#b3#b4:a1#a2#a3 b21#b22#b23#b24:a21#a22#a23 PREHOOK: query: create table map_table (foo STRING , bar MAP) @@ -1094,6 +1098,7 @@ COLLECTION ITEMS TERMINATED BY ',' MAP KEYS TERMINATED BY ':' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table map_table (foo STRING , bar MAP) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' @@ -1101,23 +1106,26 @@ COLLECTION ITEMS TERMINATED BY ',' MAP KEYS TERMINATED BY ':' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@map_table PREHOOK: query: load data local inpath "../../data/files/map_table.txt" overwrite into table map_table PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@map_table POSTHOOK: query: load data local inpath "../../data/files/map_table.txt" overwrite into table map_table POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@map_table PREHOOK: query: insert overwrite local directory '../../data/files/local_map_table_1' select * from map_table PREHOOK: type: QUERY PREHOOK: Input: default@map_table -PREHOOK: Output: ../../data/files/local_map_table_1 +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_map_table_1' select * from map_table POSTHOOK: type: QUERY POSTHOOK: Input: default@map_table -POSTHOOK: Output: ../../data/files/local_map_table_1 +#### A masked pattern was here #### foo1k1v1k2v2k3v3 foo2k21v21k22v22k31v31 PREHOOK: query: insert overwrite local directory '../../data/files/local_map_table_2' @@ -1128,7 +1136,7 @@ MAP KEYS TERMINATED BY '=' select * from map_table PREHOOK: type: QUERY PREHOOK: Input: default@map_table -PREHOOK: Output: ../../data/files/local_map_table_2 +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_map_table_2' ROW FORMAT DELIMITED FIELDS TERMINATED BY ':' @@ -1137,7 +1145,7 @@ MAP KEYS TERMINATED BY '=' select * from map_table POSTHOOK: type: QUERY POSTHOOK: Input: default@map_table -POSTHOOK: Output: ../../data/files/local_map_table_2 +#### A masked pattern was here #### foo1:k1=v1#k2=v2#k3=v3 foo2:k21=v21#k22=v22#k31=v31 PREHOOK: query: insert overwrite local directory '../../data/files/local_map_table_2_withfields' @@ -1148,7 +1156,7 @@ MAP KEYS TERMINATED BY '=' select bar,foo from map_table PREHOOK: type: QUERY PREHOOK: Input: default@map_table -PREHOOK: Output: ../../data/files/local_map_table_2_withfields +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_map_table_2_withfields' ROW FORMAT DELIMITED FIELDS TERMINATED BY ':' @@ -1157,7 +1165,7 @@ MAP KEYS TERMINATED BY '=' select bar,foo from map_table POSTHOOK: type: QUERY POSTHOOK: Input: default@map_table -POSTHOOK: Output: ../../data/files/local_map_table_2_withfields +#### A masked pattern was here #### k1=v1#k2=v2#k3=v3:foo1 k21=v21#k22=v22#k31=v31:foo2 PREHOOK: query: insert overwrite local directory '../../data/files/local_array_table_3' @@ -1166,14 +1174,14 @@ STORED AS TEXTFILE select * from array_table PREHOOK: type: QUERY PREHOOK: Input: default@array_table -PREHOOK: Output: ../../data/files/local_array_table_3 +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_array_table_3' ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.DelimitedJSONSerDe' STORED AS TEXTFILE select * from array_table POSTHOOK: type: QUERY POSTHOOK: Input: default@array_table -POSTHOOK: Output: ../../data/files/local_array_table_3 +#### A masked pattern was here #### ["a1","a2","a3"]["b1","b2","b3","b4"] ["a21","a22","a23"]["b21","b22","b23","b24"] PREHOOK: query: insert overwrite local directory '../../data/files/local_map_table_3' @@ -1182,14 +1190,14 @@ STORED AS TEXTFILE select * from map_table PREHOOK: type: QUERY PREHOOK: Input: default@map_table -PREHOOK: Output: ../../data/files/local_map_table_3 +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_map_table_3' ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.DelimitedJSONSerDe' STORED AS TEXTFILE select * from map_table POSTHOOK: type: QUERY POSTHOOK: Input: default@map_table -POSTHOOK: Output: ../../data/files/local_map_table_3 +#### A masked pattern was here #### foo1{"k1":"v1","k2":"v2","k3":"v3"} foo2{"k21":"v21","k22":"v22","k31":"v31"} PREHOOK: query: insert overwrite local directory '../../data/files/local_rctable' @@ -1197,22 +1205,25 @@ STORED AS RCFILE select value,key from src PREHOOK: type: QUERY PREHOOK: Input: default@src -PREHOOK: Output: ../../data/files/local_rctable +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_rctable' STORED AS RCFILE select value,key from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src -POSTHOOK: Output: ../../data/files/local_rctable #### A masked pattern was here #### PREHOOK: query: create external table local_rctable(value string, key string) STORED AS RCFILE #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: create external table local_rctable(value string, key string) STORED AS RCFILE #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@local_rctable PREHOOK: query: insert overwrite local directory '../../data/files/local_rctable_out' ROW FORMAT DELIMITED @@ -1220,14 +1231,14 @@ FIELDS TERMINATED BY '\t' select key,value from local_rctable PREHOOK: type: QUERY PREHOOK: Input: default@local_rctable -PREHOOK: Output: ../../data/files/local_rctable_out +#### A masked pattern was here #### POSTHOOK: query: insert overwrite local directory '../../data/files/local_rctable_out' ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' select key,value from local_rctable POSTHOOK: type: QUERY POSTHOOK: Input: default@local_rctable -POSTHOOK: Output: ../../data/files/local_rctable_out +#### A masked pattern was here #### 238 val_238 86 val_86 311 val_311 diff --git a/ql/src/test/results/clientpositive/insertexternal1.q.out b/ql/src/test/results/clientpositive/insertexternal1.q.out index d96a593..ed7e41c 100644 --- a/ql/src/test/results/clientpositive/insertexternal1.q.out +++ b/ql/src/test/results/clientpositive/insertexternal1.q.out @@ -1,14 +1,18 @@ PREHOOK: query: create table texternal(key string, val string) partitioned by (insertdate string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table texternal(key string, val string) partitioned by (insertdate string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@texternal #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@texternal +#### A masked pattern was here #### +PREHOOK: Output: default@texternal #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@texternal +#### A masked pattern was here #### +POSTHOOK: Output: default@texternal POSTHOOK: Output: default@texternal@insertdate=2008-01-01 PREHOOK: query: from src insert overwrite table texternal partition (insertdate='2008-01-01') select * PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join1.q.out b/ql/src/test/results/clientpositive/join1.q.out index 32c9157..fa715f2 100644 --- a/ql/src/test/results/clientpositive/join1.q.out +++ b/ql/src/test/results/clientpositive/join1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) diff --git a/ql/src/test/results/clientpositive/join14_hadoop20.q.out b/ql/src/test/results/clientpositive/join14_hadoop20.q.out index 6235d66..497c2f0 100644 --- a/ql/src/test/results/clientpositive/join14_hadoop20.q.out +++ b/ql/src/test/results/clientpositive/join14_hadoop20.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src JOIN srcpart ON src.key = srcpart.key AND srcpart.ds = '2008-04-08' and src.key > 100 diff --git a/ql/src/test/results/clientpositive/join17.q.out b/ql/src/test/results/clientpositive/join17.q.out index 631ffea..10a50c9 100644 --- a/ql/src/test/results/clientpositive/join17.q.out +++ b/ql/src/test/results/clientpositive/join17.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN EXTENDED FROM src src1 JOIN src src2 ON (src1.key = src2.key) diff --git a/ql/src/test/results/clientpositive/join19.q.out b/ql/src/test/results/clientpositive/join19.q.out index 9e1f159..5be2860 100644 --- a/ql/src/test/results/clientpositive/join19.q.out +++ b/ql/src/test/results/clientpositive/join19.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE triples (foo string, subject string, predicate string, object string, foo2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE triples (foo string, subject string, predicate string, object string, foo2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@triples PREHOOK: query: EXPLAIN SELECT t11.subject, t22.object , t33.subject , t55.object, t66.object diff --git a/ql/src/test/results/clientpositive/join2.q.out b/ql/src/test/results/clientpositive/join2.q.out index bd882cc..0829740 100644 --- a/ql/src/test/results/clientpositive/join2.q.out +++ b/ql/src/test/results/clientpositive/join2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j2 PREHOOK: query: EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key + src2.key = src3.key) diff --git a/ql/src/test/results/clientpositive/join24.q.out b/ql/src/test/results/clientpositive/join24.q.out index 04d34aa..933d00f 100644 --- a/ql/src/test/results/clientpositive/join24.q.out +++ b/ql/src/test/results/clientpositive/join24.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tst1(key STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst1(key STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst1 PREHOOK: query: INSERT OVERWRITE TABLE tst1 SELECT a.key, count(1) FROM src a group by a.key diff --git a/ql/src/test/results/clientpositive/join25.q.out b/ql/src/test/results/clientpositive/join25.q.out index 88a9f2f..091171c 100644 --- a/ql/src/test/results/clientpositive/join25.q.out +++ b/ql/src/test/results/clientpositive/join25.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE dest_j1 diff --git a/ql/src/test/results/clientpositive/join26.q.out b/ql/src/test/results/clientpositive/join26.q.out index b2e254b..9b25c71 100644 --- a/ql/src/test/results/clientpositive/join26.q.out +++ b/ql/src/test/results/clientpositive/join26.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: EXPLAIN EXTENDED INSERT OVERWRITE TABLE dest_j1 diff --git a/ql/src/test/results/clientpositive/join27.q.out b/ql/src/test/results/clientpositive/join27.q.out index 3a1d6aa..affbfb4 100644 --- a/ql/src/test/results/clientpositive/join27.q.out +++ b/ql/src/test/results/clientpositive/join27.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE dest_j1 diff --git a/ql/src/test/results/clientpositive/join28.q.out b/ql/src/test/results/clientpositive/join28.q.out index 68b3b71..f6f661d 100644 --- a/ql/src/test/results/clientpositive/join28.q.out +++ b/ql/src/test/results/clientpositive/join28.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin diff --git a/ql/src/test/results/clientpositive/join29.q.out b/ql/src/test/results/clientpositive/join29.q.out index d35538c..acdd3a5 100644 --- a/ql/src/test/results/clientpositive/join29.q.out +++ b/ql/src/test/results/clientpositive/join29.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin diff --git a/ql/src/test/results/clientpositive/join3.q.out b/ql/src/test/results/clientpositive/join3.q.out index be5f87f..34a4ab4 100644 --- a/ql/src/test/results/clientpositive/join3.q.out +++ b/ql/src/test/results/clientpositive/join3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key = src3.key) diff --git a/ql/src/test/results/clientpositive/join30.q.out b/ql/src/test/results/clientpositive/join30.q.out index bc52568..0f92202 100644 --- a/ql/src/test/results/clientpositive/join30.q.out +++ b/ql/src/test/results/clientpositive/join30.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key INT, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE dest_j1 diff --git a/ql/src/test/results/clientpositive/join31.q.out b/ql/src/test/results/clientpositive/join31.q.out index 0005c87..a29dd88 100644 --- a/ql/src/test/results/clientpositive/join31.q.out +++ b/ql/src/test/results/clientpositive/join31.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin diff --git a/ql/src/test/results/clientpositive/join32.q.out b/ql/src/test/results/clientpositive/join32.q.out index 7a9c173..bcece53 100644 --- a/ql/src/test/results/clientpositive/join32.q.out +++ b/ql/src/test/results/clientpositive/join32.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin diff --git a/ql/src/test/results/clientpositive/join32_lessSize.q.out b/ql/src/test/results/clientpositive/join32_lessSize.q.out index 0f1cf0c..1bebcff 100644 --- a/ql/src/test/results/clientpositive/join32_lessSize.q.out +++ b/ql/src/test/results/clientpositive/join32_lessSize.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: CREATE TABLE dest_j2(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j2(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j2 PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin diff --git a/ql/src/test/results/clientpositive/join33.q.out b/ql/src/test/results/clientpositive/join33.q.out index 7a9c173..bcece53 100644 --- a/ql/src/test/results/clientpositive/join33.q.out +++ b/ql/src/test/results/clientpositive/join33.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin diff --git a/ql/src/test/results/clientpositive/join34.q.out b/ql/src/test/results/clientpositive/join34.q.out index af04fbd..e1f2ce3 100644 --- a/ql/src/test/results/clientpositive/join34.q.out +++ b/ql/src/test/results/clientpositive/join34.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin diff --git a/ql/src/test/results/clientpositive/join35.q.out b/ql/src/test/results/clientpositive/join35.q.out index 400e858..7f52220 100644 --- a/ql/src/test/results/clientpositive/join35.q.out +++ b/ql/src/test/results/clientpositive/join35.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin diff --git a/ql/src/test/results/clientpositive/join36.q.out b/ql/src/test/results/clientpositive/join36.q.out index 7bf7e44..e57c8c0 100644 --- a/ql/src/test/results/clientpositive/join36.q.out +++ b/ql/src/test/results/clientpositive/join36.q.out @@ -1,17 +1,23 @@ PREHOOK: query: CREATE TABLE tmp1(key INT, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp1(key INT, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp1 PREHOOK: query: CREATE TABLE tmp2(key INT, cnt INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp2(key INT, cnt INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp2 PREHOOK: query: CREATE TABLE dest_j1(key INT, value INT, val2 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, value INT, val2 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: INSERT OVERWRITE TABLE tmp1 SELECT key, count(1) from src group by key diff --git a/ql/src/test/results/clientpositive/join37.q.out b/ql/src/test/results/clientpositive/join37.q.out index 900054e..cb6a507 100644 --- a/ql/src/test/results/clientpositive/join37.q.out +++ b/ql/src/test/results/clientpositive/join37.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE dest_j1 diff --git a/ql/src/test/results/clientpositive/join38.q.out b/ql/src/test/results/clientpositive/join38.q.out index b7126ee..4542ae9 100644 --- a/ql/src/test/results/clientpositive/join38.q.out +++ b/ql/src/test/results/clientpositive/join38.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tmp(col0 string, col1 string,col2 string,col3 string,col4 string,col5 string,col6 string,col7 string,col8 string,col9 string,col10 string,col11 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp(col0 string, col1 string,col2 string,col3 string,col4 string,col5 string,col6 string,col7 string,col8 string,col9 string,col10 string,col11 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp PREHOOK: query: insert overwrite table tmp select key, cast(key + 1 as int), key +2, key+3, key+4, cast(key+5 as int), key+6, key+7, key+8, key+9, key+10, cast(key+11 as int) from src where key = 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join39.q.out b/ql/src/test/results/clientpositive/join39.q.out index 50e963d..e4bc149 100644 --- a/ql/src/test/results/clientpositive/join39.q.out +++ b/ql/src/test/results/clientpositive/join39.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, key1 string, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, key1 string, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: explain INSERT OVERWRITE TABLE dest_j1 diff --git a/ql/src/test/results/clientpositive/join4.q.out b/ql/src/test/results/clientpositive/join4.q.out index e854ae5..247f1b8 100644 --- a/ql/src/test/results/clientpositive/join4.q.out +++ b/ql/src/test/results/clientpositive/join4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/join5.q.out b/ql/src/test/results/clientpositive/join5.q.out index 49dce62..6bb1928 100644 --- a/ql/src/test/results/clientpositive/join5.q.out +++ b/ql/src/test/results/clientpositive/join5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/join6.q.out b/ql/src/test/results/clientpositive/join6.q.out index 7c42462..165d50e 100644 --- a/ql/src/test/results/clientpositive/join6.q.out +++ b/ql/src/test/results/clientpositive/join6.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/join7.q.out b/ql/src/test/results/clientpositive/join7.q.out index 1b6bfa8..55a01d4 100644 --- a/ql/src/test/results/clientpositive/join7.q.out +++ b/ql/src/test/results/clientpositive/join7.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING, c5 INT, c6 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING, c5 INT, c6 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/join8.q.out b/ql/src/test/results/clientpositive/join8.q.out index a154ff9..bf7027f 100644 --- a/ql/src/test/results/clientpositive/join8.q.out +++ b/ql/src/test/results/clientpositive/join8.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM ( diff --git a/ql/src/test/results/clientpositive/join9.q.out b/ql/src/test/results/clientpositive/join9.q.out index c2bf18b..3f81098 100644 --- a/ql/src/test/results/clientpositive/join9.q.out +++ b/ql/src/test/results/clientpositive/join9.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN EXTENDED FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key) diff --git a/ql/src/test/results/clientpositive/join_1to1.q.out b/ql/src/test/results/clientpositive/join_1to1.q.out index 08d8482..71d1d41 100644 --- a/ql/src/test/results/clientpositive/join_1to1.q.out +++ b/ql/src/test/results/clientpositive/join_1to1.q.out @@ -1,24 +1,32 @@ PREHOOK: query: CREATE TABLE join_1to1_1(key1 int, key2 int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE join_1to1_1(key1 int, key2 int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@join_1to1_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in5.txt' INTO TABLE join_1to1_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@join_1to1_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in5.txt' INTO TABLE join_1to1_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@join_1to1_1 PREHOOK: query: CREATE TABLE join_1to1_2(key1 int, key2 int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE join_1to1_2(key1 int, key2 int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@join_1to1_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in6.txt' INTO TABLE join_1to1_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@join_1to1_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in6.txt' INTO TABLE join_1to1_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@join_1to1_2 PREHOOK: query: SELECT * FROM join_1to1_1 a join join_1to1_2 b on a.key1 = b.key1 ORDER BY a.key1 ASC, a.key2 ASC, a.value ASC, b.key1 ASC, b.key2 ASC, b.value ASC PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_alt_syntax.q.out b/ql/src/test/results/clientpositive/join_alt_syntax.q.out index 82cfd56..b56f4f7 100644 --- a/ql/src/test/results/clientpositive/join_alt_syntax.q.out +++ b/ql/src/test/results/clientpositive/join_alt_syntax.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: explain select p1.p_name, p2.p_name from part p1 , part p2 diff --git a/ql/src/test/results/clientpositive/join_array.q.out b/ql/src/test/results/clientpositive/join_array.q.out index 102753d..2c1bf96 100644 --- a/ql/src/test/results/clientpositive/join_array.q.out +++ b/ql/src/test/results/clientpositive/join_array.q.out @@ -1,24 +1,32 @@ PREHOOK: query: create table tinyA(a bigint, b bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tinyA(a bigint, b bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tinyA PREHOOK: query: create table tinyB(a bigint, bList array) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tinyB(a bigint, bList array) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tinyB PREHOOK: query: load data local inpath '../../data/files/tiny_a.txt' into table tinyA PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tinya POSTHOOK: query: load data local inpath '../../data/files/tiny_a.txt' into table tinyA POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tinya PREHOOK: query: load data local inpath '../../data/files/tiny_b.txt' into table tinyB PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tinyb POSTHOOK: query: load data local inpath '../../data/files/tiny_b.txt' into table tinyB POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tinyb PREHOOK: query: select * from tinyA PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_casesensitive.q.out b/ql/src/test/results/clientpositive/join_casesensitive.q.out index 8e0534c..8cfea8d 100644 --- a/ql/src/test/results/clientpositive/join_casesensitive.q.out +++ b/ql/src/test/results/clientpositive/join_casesensitive.q.out @@ -1,24 +1,32 @@ PREHOOK: query: CREATE TABLE joinone(key1 int, key2 int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE joinone(key1 int, key2 int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@joinone PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in5.txt' INTO TABLE joinone PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@joinone POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in5.txt' INTO TABLE joinone POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@joinone PREHOOK: query: CREATE TABLE joinTwo(key1 int, key2 int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE joinTwo(key1 int, key2 int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@joinTwo PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in6.txt' INTO TABLE joinTwo PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@jointwo POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in6.txt' INTO TABLE joinTwo POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@jointwo PREHOOK: query: SELECT * FROM joinone JOIN joinTwo ON(joinone.key2=joinTwo.key2) ORDER BY joinone.key1 ASC, joinone.key2 ASC, joinone.value ASC, joinTwo.key1 ASC, joinTwo.key2 ASC, joinTwo.value ASC PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out b/ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out index b6d09ab..9c75d42 100644 --- a/ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out +++ b/ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: explain select * from part p1 join part p2 join part p3 on p1.p_name = p2.p_name and p2.p_name = p3.p_name diff --git a/ql/src/test/results/clientpositive/join_cond_pushdown_2.q.out b/ql/src/test/results/clientpositive/join_cond_pushdown_2.q.out index c574b95..fb27fb0 100644 --- a/ql/src/test/results/clientpositive/join_cond_pushdown_2.q.out +++ b/ql/src/test/results/clientpositive/join_cond_pushdown_2.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: explain select * from part p1 join part p2 join part p3 on p1.p_name = p2.p_name join part p4 on p2.p_name = p3.p_name and p1.p_name = p4.p_name diff --git a/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out b/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out index 82563d7..1d7a911 100644 --- a/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out +++ b/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: explain select * from part p1 join part p2 join part p3 diff --git a/ql/src/test/results/clientpositive/join_cond_pushdown_4.q.out b/ql/src/test/results/clientpositive/join_cond_pushdown_4.q.out index 0c2c80f..888d344 100644 --- a/ql/src/test/results/clientpositive/join_cond_pushdown_4.q.out +++ b/ql/src/test/results/clientpositive/join_cond_pushdown_4.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: explain select * from part p1 join part p2 join part p3 on p1.p_name = p2.p_name join part p4 diff --git a/ql/src/test/results/clientpositive/join_empty.q.out b/ql/src/test/results/clientpositive/join_empty.q.out index c8929bf..649d13c 100644 --- a/ql/src/test/results/clientpositive/join_empty.q.out +++ b/ql/src/test/results/clientpositive/join_empty.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table srcpart_empty(key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart_empty(key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_empty PREHOOK: query: create table src2_empty (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src2_empty (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src2_empty PREHOOK: query: select /*+mapjoin(a)*/ a.key, b.value from srcpart_empty a join src b on a.key=b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_filters.q.out b/ql/src/test/results/clientpositive/join_filters.q.out index 471eb45..c5c0615 100644 --- a/ql/src/test/results/clientpositive/join_filters.q.out +++ b/ql/src/test/results/clientpositive/join_filters.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE myinput1(key int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE myinput1(key int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@myinput1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in3.txt' INTO TABLE myinput1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@myinput1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in3.txt' INTO TABLE myinput1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@myinput1 PREHOOK: query: SELECT * FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC PREHOOK: type: QUERY @@ -485,37 +489,49 @@ NULL NULL 48 NULL 100 100 100 100 PREHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_input1 PREHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_input2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input2 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key = b.key AND a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_hive_626.q.out b/ql/src/test/results/clientpositive/join_hive_626.q.out index df85b75..e2a6c72 100644 --- a/ql/src/test/results/clientpositive/join_hive_626.q.out +++ b/ql/src/test/results/clientpositive/join_hive_626.q.out @@ -2,44 +2,56 @@ PREHOOK: query: create table hive_foo (foo_id int, foo_name string, foo_a string foo_c string, foo_d string) row format delimited fields terminated by ',' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_foo (foo_id int, foo_name string, foo_a string, foo_b string, foo_c string, foo_d string) row format delimited fields terminated by ',' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_foo PREHOOK: query: create table hive_bar (bar_id int, bar_0 int, foo_id int, bar_1 int, bar_name string, bar_a string, bar_b string, bar_c string, bar_d string) row format delimited fields terminated by ',' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_bar (bar_id int, bar_0 int, foo_id int, bar_1 int, bar_name string, bar_a string, bar_b string, bar_c string, bar_d string) row format delimited fields terminated by ',' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_bar PREHOOK: query: create table hive_count (bar_id int, n int) row format delimited fields terminated by ',' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_count (bar_id int, n int) row format delimited fields terminated by ',' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_count PREHOOK: query: load data local inpath '../../data/files/hive_626_foo.txt' overwrite into table hive_foo PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_foo POSTHOOK: query: load data local inpath '../../data/files/hive_626_foo.txt' overwrite into table hive_foo POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_foo PREHOOK: query: load data local inpath '../../data/files/hive_626_bar.txt' overwrite into table hive_bar PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_bar POSTHOOK: query: load data local inpath '../../data/files/hive_626_bar.txt' overwrite into table hive_bar POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_bar PREHOOK: query: load data local inpath '../../data/files/hive_626_count.txt' overwrite into table hive_count PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_count POSTHOOK: query: load data local inpath '../../data/files/hive_626_count.txt' overwrite into table hive_count POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_count PREHOOK: query: explain select hive_foo.foo_name, hive_bar.bar_name, n from hive_foo join hive_bar on hive_foo.foo_id = diff --git a/ql/src/test/results/clientpositive/join_map_ppr.q.out b/ql/src/test/results/clientpositive/join_map_ppr.q.out index 09b9462..f5c9b32 100644 --- a/ql/src/test/results/clientpositive/join_map_ppr.q.out +++ b/ql/src/test/results/clientpositive/join_map_ppr.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: EXPLAIN EXTENDED INSERT OVERWRITE TABLE dest_j1 @@ -543,16 +545,20 @@ POSTHOOK: Lineage: dest_j1.value SIMPLE [(srcpart)z.FieldSchema(name:value, type 98 val_98 val_98 PREHOOK: query: CREATE TABLE src_copy(key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_copy(key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_copy POSTHOOK: Lineage: dest_j1.key SIMPLE [(src1)x.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest_j1.val2 SIMPLE [(src)y.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: dest_j1.value SIMPLE [(srcpart)z.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE src1_copy(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src1_copy(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src1_copy POSTHOOK: Lineage: dest_j1.key SIMPLE [(src1)x.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest_j1.val2 SIMPLE [(src)y.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/join_merging.q.out b/ql/src/test/results/clientpositive/join_merging.q.out index 7c8b401..b614f7a 100644 --- a/ql/src/test/results/clientpositive/join_merging.q.out +++ b/ql/src/test/results/clientpositive/join_merging.q.out @@ -10,6 +10,7 @@ PREHOOK: query: CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, @@ -22,6 +23,7 @@ POSTHOOK: query: CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: explain select p1.p_size, p2.p_size from part p1 left outer join part p2 on p1.p_partkey = p2.p_partkey diff --git a/ql/src/test/results/clientpositive/join_nulls.q.out b/ql/src/test/results/clientpositive/join_nulls.q.out index 10e4c9b..3d35e43 100644 --- a/ql/src/test/results/clientpositive/join_nulls.q.out +++ b/ql/src/test/results/clientpositive/join_nulls.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE myinput1(key int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE myinput1(key int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@myinput1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' INTO TABLE myinput1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@myinput1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' INTO TABLE myinput1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@myinput1 PREHOOK: query: SELECT * FROM myinput1 a JOIN myinput1 b ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC PREHOOK: type: QUERY @@ -421,37 +425,49 @@ NULL 35 NULL 35 100 100 100 100 PREHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_input1 PREHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_input2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input2 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key = b.key ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_nullsafe.q.out b/ql/src/test/results/clientpositive/join_nullsafe.q.out index 5111635..7f711b5 100644 --- a/ql/src/test/results/clientpositive/join_nullsafe.q.out +++ b/ql/src/test/results/clientpositive/join_nullsafe.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE myinput1(key int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE myinput1(key int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@myinput1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' INTO TABLE myinput1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@myinput1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' INTO TABLE myinput1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@myinput1 PREHOOK: query: -- merging explain select * from myinput1 a join myinput1 b on a.key<=>b.value ORDER BY a.key, a.value, b.key, b.value @@ -628,38 +632,50 @@ NULL 35 48 NULL PREHOOK: query: -- smbs CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- smbs CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_input1 PREHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_input2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_input2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_input2 PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key ORDER BY a.key, a.value, b.key, b.value PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_rc.q.out b/ql/src/test/results/clientpositive/join_rc.q.out index af4237c..de0f361 100644 --- a/ql/src/test/results/clientpositive/join_rc.q.out +++ b/ql/src/test/results/clientpositive/join_rc.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table join_rc1(key string, value string) stored as RCFile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table join_rc1(key string, value string) stored as RCFile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@join_rc1 PREHOOK: query: create table join_rc2(key string, value string) stored as RCFile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table join_rc2(key string, value string) stored as RCFile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@join_rc2 PREHOOK: query: insert overwrite table join_rc1 select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_reorder.q.out b/ql/src/test/results/clientpositive/join_reorder.q.out index 0033457..1480494 100644 --- a/ql/src/test/results/clientpositive/join_reorder.q.out +++ b/ql/src/test/results/clientpositive/join_reorder.q.out @@ -1,35 +1,47 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT a.key, a.val, c.key diff --git a/ql/src/test/results/clientpositive/join_reorder2.q.out b/ql/src/test/results/clientpositive/join_reorder2.q.out index 39c5900..9cdbb1f 100644 --- a/ql/src/test/results/clientpositive/join_reorder2.q.out +++ b/ql/src/test/results/clientpositive/join_reorder2.q.out @@ -1,46 +1,62 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T4 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t4 PREHOOK: query: EXPLAIN SELECT /*+ STREAMTABLE(a) */ * diff --git a/ql/src/test/results/clientpositive/join_reorder3.q.out b/ql/src/test/results/clientpositive/join_reorder3.q.out index 28ff251..8bcb17f 100644 --- a/ql/src/test/results/clientpositive/join_reorder3.q.out +++ b/ql/src/test/results/clientpositive/join_reorder3.q.out @@ -1,46 +1,62 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T4 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t4 PREHOOK: query: EXPLAIN SELECT /*+ STREAMTABLE(a,c) */ * diff --git a/ql/src/test/results/clientpositive/join_reorder4.q.out b/ql/src/test/results/clientpositive/join_reorder4.q.out index 8aaf847..ebd5615 100644 --- a/ql/src/test/results/clientpositive/join_reorder4.q.out +++ b/ql/src/test/results/clientpositive/join_reorder4.q.out @@ -1,35 +1,47 @@ PREHOOK: query: CREATE TABLE T1(key1 STRING, val1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key1 STRING, val1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: CREATE TABLE T2(key2 STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key2 STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: CREATE TABLE T3(key3 STRING, val3 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key3 STRING, val3 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: explain select /*+ STREAMTABLE(a) */ a.*, b.*, c.* from T1 a join T2 b on a.key1=b.key2 join T3 c on a.key1=c.key3 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_star.q.out b/ql/src/test/results/clientpositive/join_star.q.out index 05d0d31..22ba95d 100644 --- a/ql/src/test/results/clientpositive/join_star.q.out +++ b/ql/src/test/results/clientpositive/join_star.q.out @@ -1,90 +1,122 @@ PREHOOK: query: create table fact(m1 int, m2 int, d1 int, d2 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table fact(m1 int, m2 int, d1 int, d2 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@fact PREHOOK: query: create table dim1(f1 int, f2 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dim1(f1 int, f2 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dim1 PREHOOK: query: create table dim2(f3 int, f4 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dim2(f3 int, f4 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dim2 PREHOOK: query: create table dim3(f5 int, f6 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dim3(f5 int, f6 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dim3 PREHOOK: query: create table dim4(f7 int, f8 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dim4(f7 int, f8 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dim4 PREHOOK: query: create table dim5(f9 int, f10 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dim5(f9 int, f10 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dim5 PREHOOK: query: create table dim6(f11 int, f12 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dim6(f11 int, f12 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dim6 PREHOOK: query: create table dim7(f13 int, f14 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dim7(f13 int, f14 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dim7 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/fact-data.txt' INTO TABLE fact PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@fact POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/fact-data.txt' INTO TABLE fact POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@fact PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dim1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dim1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dim2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dim2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dim3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dim3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dim4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dim4 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim5 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dim5 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim5 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dim5 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim6 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dim6 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim6 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dim6 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim7 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dim7 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim7 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dim7 PREHOOK: query: explain select m1, m2, f2 from fact join dim1 on fact.d1=dim1.f1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_view.q.out b/ql/src/test/results/clientpositive/join_view.q.out index 1ec6846..7c68d13 100644 --- a/ql/src/test/results/clientpositive/join_view.q.out +++ b/ql/src/test/results/clientpositive/join_view.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: drop table invites2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table invites (foo int, bar string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table invites (foo int, bar string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@invites PREHOOK: query: create table invites2 (foo int, bar string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table invites2 (foo int, bar string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@invites2 PREHOOK: query: -- test join views: see HIVE-1989 diff --git a/ql/src/test/results/clientpositive/keyword_1.q.out b/ql/src/test/results/clientpositive/keyword_1.q.out index 8a2893a..4332c14 100644 --- a/ql/src/test/results/clientpositive/keyword_1.q.out +++ b/ql/src/test/results/clientpositive/keyword_1.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table test_user (user string, `group` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- SORT_BEFORE_DIFF create table test_user (user string, `group` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_user PREHOOK: query: grant select on table test_user to user hive_test PREHOOK: type: GRANT_PRIVILEGE @@ -59,8 +61,10 @@ POSTHOOK: Input: default@test_user POSTHOOK: Output: default@test_user PREHOOK: query: create table test_user (role string, `group` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test_user (role string, `group` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_user PREHOOK: query: grant select on table test_user to user hive_test PREHOOK: type: GRANT_PRIVILEGE diff --git a/ql/src/test/results/clientpositive/lateral_view.q.out b/ql/src/test/results/clientpositive/lateral_view.q.out index 119ddf5..59a10ba 100644 --- a/ql/src/test/results/clientpositive/lateral_view.q.out +++ b/ql/src/test/results/clientpositive/lateral_view.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE tmp_pyang_lv (inputs string) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp_pyang_lv (inputs string) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_pyang_lv PREHOOK: query: INSERT OVERWRITE TABLE tmp_pyang_lv SELECT key FROM src PREHOOK: type: QUERY @@ -574,8 +576,10 @@ POSTHOOK: Lineage: tmp_pyang_lv.inputs SIMPLE [(src)src.FieldSchema(name:key, ty 3 PREHOOK: query: CREATE TABLE tmp_pyang_src_rcfile (key string, value array) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp_pyang_src_rcfile (key string, value array) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_pyang_src_rcfile POSTHOOK: Lineage: tmp_pyang_lv.inputs SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: INSERT OVERWRITE TABLE tmp_pyang_src_rcfile SELECT key, array(value) FROM src ORDER BY key LIMIT 20 diff --git a/ql/src/test/results/clientpositive/lateral_view_cp.q.out b/ql/src/test/results/clientpositive/lateral_view_cp.q.out index c3f7508..2058115 100644 --- a/ql/src/test/results/clientpositive/lateral_view_cp.q.out +++ b/ql/src/test/results/clientpositive/lateral_view_cp.q.out @@ -6,8 +6,10 @@ drop table array_valued_src POSTHOOK: type: DROPTABLE PREHOOK: query: create table array_valued_src (key string, value array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table array_valued_src (key string, value array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@array_valued_src PREHOOK: query: insert overwrite table array_valued_src select key, array(value) from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/leadlag.q.out b/ql/src/test/results/clientpositive/leadlag.q.out index 58dba32..4eb2641 100644 --- a/ql/src/test/results/clientpositive/leadlag.q.out +++ b/ql/src/test/results/clientpositive/leadlag.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: --1. testLagWithPTFWindowing select p_mfgr, p_name, diff --git a/ql/src/test/results/clientpositive/leadlag_queries.q.out b/ql/src/test/results/clientpositive/leadlag_queries.q.out index 93238f5..3d7f9af 100644 --- a/ql/src/test/results/clientpositive/leadlag_queries.q.out +++ b/ql/src/test/results/clientpositive/leadlag_queries.q.out @@ -11,6 +11,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -24,12 +25,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: -- 1. testLeadUDAF select p_mfgr, p_retailprice, diff --git a/ql/src/test/results/clientpositive/leftsemijoin.q.out b/ql/src/test/results/clientpositive/leftsemijoin.q.out index d8ecfbf..c23c537 100644 --- a/ql/src/test/results/clientpositive/leftsemijoin.q.out +++ b/ql/src/test/results/clientpositive/leftsemijoin.q.out @@ -9,35 +9,45 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE sales (name STRING, id INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE sales (name STRING, id INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@sales PREHOOK: query: CREATE TABLE things (id INT, name STRING) partitioned by (ds string) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE things (id INT, name STRING) partitioned by (ds string) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@things PREHOOK: query: load data local inpath '../../data/files/sales.txt' INTO TABLE sales PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@sales POSTHOOK: query: load data local inpath '../../data/files/sales.txt' INTO TABLE sales POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@sales PREHOOK: query: load data local inpath '../../data/files/things.txt' INTO TABLE things partition(ds='2011-10-23') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@things POSTHOOK: query: load data local inpath '../../data/files/things.txt' INTO TABLE things partition(ds='2011-10-23') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@things POSTHOOK: Output: default@things@ds=2011-10-23 PREHOOK: query: load data local inpath '../../data/files/things2.txt' INTO TABLE things partition(ds='2011-10-24') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@things POSTHOOK: query: load data local inpath '../../data/files/things2.txt' INTO TABLE things partition(ds='2011-10-24') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@things POSTHOOK: Output: default@things@ds=2011-10-24 PREHOOK: query: SELECT name,id FROM sales ORDER BY name ASC, id ASC diff --git a/ql/src/test/results/clientpositive/leftsemijoin_mr.q.out b/ql/src/test/results/clientpositive/leftsemijoin_mr.q.out index 3ca0e15..0eeabda 100644 --- a/ql/src/test/results/clientpositive/leftsemijoin_mr.q.out +++ b/ql/src/test/results/clientpositive/leftsemijoin_mr.q.out @@ -1,24 +1,32 @@ PREHOOK: query: CREATE TABLE T1(key INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/leftsemijoin_mr_t1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/leftsemijoin_mr_t1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/leftsemijoin_mr_t2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/leftsemijoin_mr_t2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- Run this query using TestMinimrCliDriver diff --git a/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out b/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out index 5176031..115b171 100644 --- a/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out +++ b/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out @@ -204,14 +204,18 @@ STAGE PLANS: PREHOOK: query: -- negative, RS + forward + multi-groupby CREATE TABLE dest_2(key STRING, c1 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- negative, RS + forward + multi-groupby CREATE TABLE dest_2(key STRING, c1 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_2 PREHOOK: query: CREATE TABLE dest_3(key STRING, c1 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_3(key STRING, c1 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_3 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest_2 SELECT value, sum(key) GROUP BY value diff --git a/ql/src/test/results/clientpositive/lineage1.q.out b/ql/src/test/results/clientpositive/lineage1.q.out index 2b32507..3b4e780 100644 --- a/ql/src/test/results/clientpositive/lineage1.q.out +++ b/ql/src/test/results/clientpositive/lineage1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest_l1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_l1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_l1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE dest_l1 diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out index 3f2bb39..6c37697 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out @@ -18,6 +18,7 @@ create table list_bucketing_static_part (key String, value String) stored as DIRECTORIES STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- run this test case in minimr to ensure it works in cluster -- list bucketing DML: static partition. multiple skewed columns. @@ -38,6 +39,7 @@ create table list_bucketing_static_part (key String, value String) stored as DIRECTORIES STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@list_bucketing_static_part PREHOOK: query: -- list bucketing DML without merge. use bucketize to generate a few small files. explain extended diff --git a/ql/src/test/results/clientpositive/load_binary_data.q.out b/ql/src/test/results/clientpositive/load_binary_data.q.out index 76fbe74..2bb889e 100644 --- a/ql/src/test/results/clientpositive/load_binary_data.q.out +++ b/ql/src/test/results/clientpositive/load_binary_data.q.out @@ -3,26 +3,32 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY '9' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE mytable(key binary, value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '9' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mytable PREHOOK: query: -- this query loads native binary data, stores in a table and then queries it. Note that string.txt contains binary data. Also uses transform clause and then length udf. LOAD DATA LOCAL INPATH '../../data/files/string.txt' INTO TABLE mytable PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@mytable POSTHOOK: query: -- this query loads native binary data, stores in a table and then queries it. Note that string.txt contains binary data. Also uses transform clause and then length udf. LOAD DATA LOCAL INPATH '../../data/files/string.txt' INTO TABLE mytable POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@mytable PREHOOK: query: create table dest1 (key binary, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest1 (key binary, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: insert overwrite table dest1 select transform(*) using 'cat' as key binary, value int from mytable PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/load_dyn_part1.q.out b/ql/src/test/results/clientpositive/load_dyn_part1.q.out index 7c9bf40..84ce714 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part1.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part1.q.out @@ -8,13 +8,17 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part1 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part1 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part1 PREHOOK: query: create table if not exists nzhang_part2 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part2 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part2 PREHOOK: query: describe extended nzhang_part1 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part10.q.out b/ql/src/test/results/clientpositive/load_dyn_part10.q.out index 57646a1..03be8c2 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part10.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part10.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part10 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part10 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part10 PREHOOK: query: describe extended nzhang_part10 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part11.q.out b/ql/src/test/results/clientpositive/load_dyn_part11.q.out index 883ee61..d3d2792 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part11.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part11.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part PREHOOK: query: describe extended nzhang_part PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part12.q.out b/ql/src/test/results/clientpositive/load_dyn_part12.q.out index 04a2b0b..9b209f4 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part12.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part12.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part12 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part12 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part12 PREHOOK: query: describe extended nzhang_part12 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part13.q.out b/ql/src/test/results/clientpositive/load_dyn_part13.q.out index 85a4470..db22dd8 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part13.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part13.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part13 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part13 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part13 PREHOOK: query: describe extended nzhang_part13 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part14.q.out b/ql/src/test/results/clientpositive/load_dyn_part14.q.out index a2d53d5..44e836e 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part14.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part14.q.out @@ -4,12 +4,14 @@ PREHOOK: query: -- EXCLUDE_OS_WINDOWS create table if not exists nzhang_part14 (key string) partitioned by (value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- EXCLUDE_OS_WINDOWS -- excluded on windows because of difference in file name encoding logic create table if not exists nzhang_part14 (key string) partitioned by (value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part14 PREHOOK: query: describe extended nzhang_part14 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part15.q.out b/ql/src/test/results/clientpositive/load_dyn_part15.q.out index 8d91551..edd8612 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part15.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part15.q.out @@ -1,9 +1,11 @@ PREHOOK: query: create table if not exists load_dyn_part15_test (key string) partitioned by (part_key string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists load_dyn_part15_test (key string) partitioned by (part_key string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@load_dyn_part15_test PREHOOK: query: show partitions load_dyn_part15_test PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/load_dyn_part2.q.out b/ql/src/test/results/clientpositive/load_dyn_part2.q.out index b46147b..22019c7 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part2.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part2.q.out @@ -2,10 +2,12 @@ PREHOOK: query: create table if not exists nzhang_part_bucket (key string, value partitioned by (ds string, hr string) clustered by (key) into 10 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part_bucket (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 10 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part_bucket PREHOOK: query: describe extended nzhang_part_bucket PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part3.q.out b/ql/src/test/results/clientpositive/load_dyn_part3.q.out index 1771948..5b08184 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part3.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part3.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part3 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part3 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part3 PREHOOK: query: describe extended nzhang_part3 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part4.q.out b/ql/src/test/results/clientpositive/load_dyn_part4.q.out index ba38782..732f123 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part4.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part4.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part4 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part4 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part4 PREHOOK: query: describe extended nzhang_part4 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part5.q.out b/ql/src/test/results/clientpositive/load_dyn_part5.q.out index 8d9871e..0e5f341 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part5.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table if not exists nzhang_part5 (key string) partitioned by (value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part5 (key string) partitioned by (value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part5 PREHOOK: query: describe extended nzhang_part5 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part6.q.out b/ql/src/test/results/clientpositive/load_dyn_part6.q.out index e23b366..d0901b5 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part6.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part6.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part6 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part6 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part6 PREHOOK: query: describe extended nzhang_part6 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part7.q.out b/ql/src/test/results/clientpositive/load_dyn_part7.q.out index 5c274c5..f7f4f76 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part7.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part7.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part7 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part7 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part7 PREHOOK: query: describe extended nzhang_part7 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part8.q.out b/ql/src/test/results/clientpositive/load_dyn_part8.q.out index 968cef1..7c80a96 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part8.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part8.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part8 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part8 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part8 PREHOOK: query: describe extended nzhang_part8 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_dyn_part9.q.out b/ql/src/test/results/clientpositive/load_dyn_part9.q.out index 67ad1a6..2794bcb 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part9.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part9.q.out @@ -8,8 +8,10 @@ ds=2008-04-09/hr=11 ds=2008-04-09/hr=12 PREHOOK: query: create table if not exists nzhang_part9 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part9 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part9 PREHOOK: query: describe extended nzhang_part9 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/load_exist_part_authsuccess.q.out b/ql/src/test/results/clientpositive/load_exist_part_authsuccess.q.out index f674f2f..65f954f 100644 --- a/ql/src/test/results/clientpositive/load_exist_part_authsuccess.q.out +++ b/ql/src/test/results/clientpositive/load_exist_part_authsuccess.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_src PREHOOK: query: alter table hive_test_src add partition (pcol1 = 'test_part') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@hive_test_src +PREHOOK: Output: default@hive_test_src POSTHOOK: query: alter table hive_test_src add partition (pcol1 = 'test_part') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@hive_test_src +POSTHOOK: Output: default@hive_test_src POSTHOOK: Output: default@hive_test_src@pcol1=test_part PREHOOK: query: grant Update on table hive_test_src to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE @@ -18,7 +20,9 @@ POSTHOOK: type: GRANT_PRIVILEGE POSTHOOK: Output: default@hive_test_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_test_src@pcol1=test_part POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_test_src@pcol1=test_part diff --git a/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out b/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out index 717c4a4..8b6313f 100644 --- a/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out +++ b/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out @@ -3,21 +3,27 @@ PREHOOK: query: -- test for loading into tables with the file with space in the CREATE TABLE load_file_with_space_in_the_name(name STRING, age INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test for loading into tables with the file with space in the name CREATE TABLE load_file_with_space_in_the_name(name STRING, age INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@load_file_with_space_in_the_name PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/person age.txt' INTO TABLE load_file_with_space_in_the_name PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_file_with_space_in_the_name POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/person age.txt' INTO TABLE load_file_with_space_in_the_name POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_file_with_space_in_the_name PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/person+age.txt' INTO TABLE load_file_with_space_in_the_name PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_file_with_space_in_the_name POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/person+age.txt' INTO TABLE load_file_with_space_in_the_name POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_file_with_space_in_the_name diff --git a/ql/src/test/results/clientpositive/load_fs.q.out b/ql/src/test/results/clientpositive/load_fs.q.out index 563863d..e77dd68 100644 --- a/ql/src/test/results/clientpositive/load_fs.q.out +++ b/ql/src/test/results/clientpositive/load_fs.q.out @@ -1,30 +1,44 @@ #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@load_overwrite #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@load_overwrite2 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table load_overwrite PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_overwrite POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table load_overwrite POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_overwrite PREHOOK: query: load data local inpath '../../data/files/kv2.txt' into table load_overwrite PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_overwrite POSTHOOK: query: load data local inpath '../../data/files/kv2.txt' into table load_overwrite POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_overwrite PREHOOK: query: load data local inpath '../../data/files/kv3.txt' into table load_overwrite PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_overwrite POSTHOOK: query: load data local inpath '../../data/files/kv3.txt' into table load_overwrite POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_overwrite PREHOOK: query: show table extended like load_overwrite PREHOOK: type: SHOW_TABLESTATUS @@ -62,9 +76,11 @@ POSTHOOK: Input: default@load_overwrite 1025 #### A masked pattern was here #### PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_overwrite2 #### A masked pattern was here #### POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_overwrite2 PREHOOK: query: show table extended like load_overwrite2 PREHOOK: type: SHOW_TABLESTATUS @@ -102,9 +118,11 @@ POSTHOOK: Input: default@load_overwrite2 1025 #### A masked pattern was here #### PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_overwrite #### A masked pattern was here #### POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_overwrite PREHOOK: query: show table extended like load_overwrite PREHOOK: type: SHOW_TABLESTATUS diff --git a/ql/src/test/results/clientpositive/load_fs2.q.out b/ql/src/test/results/clientpositive/load_fs2.q.out index 2340dba..7fe62e4 100644 --- a/ql/src/test/results/clientpositive/load_fs2.q.out +++ b/ql/src/test/results/clientpositive/load_fs2.q.out @@ -3,28 +3,36 @@ PREHOOK: query: -- HIVE-3300 [jira] LOAD DATA INPATH fails if a hdfs file with s create table result (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-3300 [jira] LOAD DATA INPATH fails if a hdfs file with same name is added to table -- 'loader' table is used only for uploading kv1.txt to HDFS (!hdfs -put is not working on minMRDriver) create table result (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@result PREHOOK: query: create table loader (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table loader (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@loader PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table loader PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@loader POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table loader POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@loader PREHOOK: query: load data inpath '/build/ql/test/data/warehouse/loader/kv1.txt' into table result PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@result POSTHOOK: query: load data inpath '/build/ql/test/data/warehouse/loader/kv1.txt' into table result POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@result PREHOOK: query: show table extended like result PREHOOK: type: SHOW_TABLESTATUS @@ -45,15 +53,19 @@ minFileSize:5812 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table loader PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@loader POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table loader POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@loader PREHOOK: query: load data inpath '/build/ql/test/data/warehouse/loader/kv1.txt' into table result PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@result POSTHOOK: query: load data inpath '/build/ql/test/data/warehouse/loader/kv1.txt' into table result POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@result PREHOOK: query: show table extended like result PREHOOK: type: SHOW_TABLESTATUS @@ -74,15 +86,19 @@ minFileSize:5812 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table loader PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@loader POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table loader POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@loader PREHOOK: query: load data inpath '/build/ql/test/data/warehouse/loader/kv1.txt' into table result PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@result POSTHOOK: query: load data inpath '/build/ql/test/data/warehouse/loader/kv1.txt' into table result POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@result PREHOOK: query: show table extended like result PREHOOK: type: SHOW_TABLESTATUS diff --git a/ql/src/test/results/clientpositive/load_fs_overwrite.q.out b/ql/src/test/results/clientpositive/load_fs_overwrite.q.out index 61fa07c..69fb969 100644 --- a/ql/src/test/results/clientpositive/load_fs_overwrite.q.out +++ b/ql/src/test/results/clientpositive/load_fs_overwrite.q.out @@ -13,24 +13,36 @@ POSTHOOK: type: DROPTABLE #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@target #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@temp PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table temp PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@temp POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table temp POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@temp #### A masked pattern was here #### PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@target #### A masked pattern was here #### POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@target PREHOOK: query: select count(*) from target PREHOOK: type: QUERY @@ -43,15 +55,19 @@ POSTHOOK: Input: default@target 500 PREHOOK: query: load data local inpath '../../data/files/kv2.txt' into table temp PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@temp POSTHOOK: query: load data local inpath '../../data/files/kv2.txt' into table temp POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@temp #### A masked pattern was here #### PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@target #### A masked pattern was here #### POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@target PREHOOK: query: select count(*) from target PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/load_hdfs_file_with_space_in_the_name.q.out b/ql/src/test/results/clientpositive/load_hdfs_file_with_space_in_the_name.q.out index fcc4339..d6c8bdf 100644 --- a/ql/src/test/results/clientpositive/load_hdfs_file_with_space_in_the_name.q.out +++ b/ql/src/test/results/clientpositive/load_hdfs_file_with_space_in_the_name.q.out @@ -1,18 +1,24 @@ PREHOOK: query: CREATE TABLE load_file_with_space_in_the_name(name STRING, age INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE load_file_with_space_in_the_name(name STRING, age INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@load_file_with_space_in_the_name #### A masked pattern was here #### PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_file_with_space_in_the_name #### A masked pattern was here #### POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_file_with_space_in_the_name #### A masked pattern was here #### PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_file_with_space_in_the_name #### A masked pattern was here #### POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_file_with_space_in_the_name #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/load_nonpart_authsuccess.q.out b/ql/src/test/results/clientpositive/load_nonpart_authsuccess.q.out index ca96d95..f3b8d49 100644 --- a/ql/src/test/results/clientpositive/load_nonpart_authsuccess.q.out +++ b/ql/src/test/results/clientpositive/load_nonpart_authsuccess.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table hive_test_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_src PREHOOK: query: grant Update on table hive_test_src to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE @@ -11,7 +13,9 @@ POSTHOOK: type: GRANT_PRIVILEGE POSTHOOK: Output: default@hive_test_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_test_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_test_src diff --git a/ql/src/test/results/clientpositive/load_overwrite.q.out b/ql/src/test/results/clientpositive/load_overwrite.q.out index 39c7e7c..359cd87 100644 --- a/ql/src/test/results/clientpositive/load_overwrite.q.out +++ b/ql/src/test/results/clientpositive/load_overwrite.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table load_overwrite like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table load_overwrite like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@load_overwrite PREHOOK: query: insert overwrite table load_overwrite select * from src PREHOOK: type: QUERY @@ -45,9 +47,11 @@ POSTHOOK: Lineage: load_overwrite.value SIMPLE [(src)src.FieldSchema(name:value, 500 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table load_overwrite PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_overwrite POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table load_overwrite POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_overwrite POSTHOOK: Lineage: load_overwrite.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: load_overwrite.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -83,9 +87,11 @@ POSTHOOK: Lineage: load_overwrite.value SIMPLE [(src)src.FieldSchema(name:value, 1000 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table load_overwrite PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@load_overwrite POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table load_overwrite POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@load_overwrite POSTHOOK: Lineage: load_overwrite.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: load_overwrite.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/load_part_authsuccess.q.out b/ql/src/test/results/clientpositive/load_part_authsuccess.q.out index 560c582..75f0609 100644 --- a/ql/src/test/results/clientpositive/load_part_authsuccess.q.out +++ b/ql/src/test/results/clientpositive/load_part_authsuccess.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_src PREHOOK: query: grant Update on table hive_test_src to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE @@ -11,8 +13,10 @@ POSTHOOK: type: GRANT_PRIVILEGE POSTHOOK: Output: default@hive_test_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_test_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_test_src POSTHOOK: Output: default@hive_test_src@pcol1=test_part diff --git a/ql/src/test/results/clientpositive/loadpart1.q.out b/ql/src/test/results/clientpositive/loadpart1.q.out index 84f9631..d5ba380 100644 --- a/ql/src/test/results/clientpositive/loadpart1.q.out +++ b/ql/src/test/results/clientpositive/loadpart1.q.out @@ -1,18 +1,24 @@ PREHOOK: query: create table hive_test_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_src PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_test_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_test_src PREHOOK: query: create table hive_test_dst ( col1 string ) partitioned by ( pcol1 string , pcol2 string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_dst ( col1 string ) partitioned by ( pcol1 string , pcol2 string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_dst PREHOOK: query: insert overwrite table hive_test_dst partition ( pcol1='test_part', pCol2='test_Part') select col1 from hive_test_src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/loadpart2.q.out b/ql/src/test/results/clientpositive/loadpart2.q.out index ba89d5b..44c99a1 100644 --- a/ql/src/test/results/clientpositive/loadpart2.q.out +++ b/ql/src/test/results/clientpositive/loadpart2.q.out @@ -1,20 +1,26 @@ PREHOOK: query: create table hive_test ( col1 string ) partitioned by ( pcol1 string , pcol2 string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test ( col1 string ) partitioned by ( pcol1 string , pcol2 string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test partition (pcol1='part1',pcol2='part1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_test POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test partition (pcol1='part1',pcol2='part1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_test POSTHOOK: Output: default@hive_test@pcol1=part1/pcol2=part1 PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test partition (pcol2='part2',pcol1='part2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_test POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test partition (pcol2='part2',pcol1='part2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_test POSTHOOK: Output: default@hive_test@pcol1=part2/pcol2=part2 PREHOOK: query: select * from hive_test where pcol1='part1' and pcol2='part1' diff --git a/ql/src/test/results/clientpositive/lock1.q.out b/ql/src/test/results/clientpositive/lock1.q.out index d6a84e2..d480e54 100644 --- a/ql/src/test/results/clientpositive/lock1.q.out +++ b/ql/src/test/results/clientpositive/lock1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrc POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/lock2.q.out b/ql/src/test/results/clientpositive/lock2.q.out index 1a6ab78..bdd3baf 100644 --- a/ql/src/test/results/clientpositive/lock2.q.out +++ b/ql/src/test/results/clientpositive/lock2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrc POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src PREHOOK: type: QUERY @@ -25,8 +27,10 @@ POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/lock3.q.out b/ql/src/test/results/clientpositive/lock3.q.out index f5bfa30..8aaedaf 100644 --- a/ql/src/test/results/clientpositive/lock3.q.out +++ b/ql/src/test/results/clientpositive/lock3.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: from srcpart insert overwrite table tstsrcpart partition (ds='2008-04-08',hr='11') @@ -131,8 +133,10 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table tst1 (key string, value string) partitioned by (a string, b string, c string, d string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst1 (key string, value string) partitioned by (a string, b string, c string, d string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst1 POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/lock4.q.out b/ql/src/test/results/clientpositive/lock4.q.out index f5bfa30..8aaedaf 100644 --- a/ql/src/test/results/clientpositive/lock4.q.out +++ b/ql/src/test/results/clientpositive/lock4.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: from srcpart insert overwrite table tstsrcpart partition (ds='2008-04-08',hr='11') @@ -131,8 +133,10 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table tst1 (key string, value string) partitioned by (a string, b string, c string, d string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tst1 (key string, value string) partitioned by (a string, b string, c string, d string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tst1 POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/mapjoin_hook.q.out b/ql/src/test/results/clientpositive/mapjoin_hook.q.out index 594ac9c..eeb2135 100644 --- a/ql/src/test/results/clientpositive/mapjoin_hook.q.out +++ b/ql/src/test/results/clientpositive/mapjoin_hook.q.out @@ -2,6 +2,7 @@ PREHOOK: query: drop table dest1 PREHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default PREHOOK: query: INSERT OVERWRITE TABLE dest1 SELECT /*+ MAPJOIN(x) */ x.key, count(1) FROM src1 x JOIN src y ON (x.key = y.key) group by x.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/mapjoin_subquery2.q.out b/ql/src/test/results/clientpositive/mapjoin_subquery2.q.out index 82acdb6..1528b93 100644 --- a/ql/src/test/results/clientpositive/mapjoin_subquery2.q.out +++ b/ql/src/test/results/clientpositive/mapjoin_subquery2.q.out @@ -13,41 +13,53 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE x (name STRING, id INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE x (name STRING, id INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@x PREHOOK: query: CREATE TABLE y (id INT, name STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE y (id INT, name STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@y PREHOOK: query: CREATE TABLE z (id INT, name STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE z (id INT, name STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@z PREHOOK: query: load data local inpath '../../data/files/x.txt' INTO TABLE x PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@x POSTHOOK: query: load data local inpath '../../data/files/x.txt' INTO TABLE x POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@x PREHOOK: query: load data local inpath '../../data/files/y.txt' INTO TABLE y PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@y POSTHOOK: query: load data local inpath '../../data/files/y.txt' INTO TABLE y POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@y PREHOOK: query: load data local inpath '../../data/files/z.txt' INTO TABLE z PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@z POSTHOOK: query: load data local inpath '../../data/files/z.txt' INTO TABLE z POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@z PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin diff --git a/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out b/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out index 36deabb..b4f90df 100644 --- a/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out +++ b/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out @@ -2,10 +2,12 @@ PREHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a create table dest_1 (key STRING, value STRING) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition create table dest_1 (key STRING, value STRING) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_1 PREHOOK: query: insert overwrite table dest_1 select * from src1 order by src1.value limit 8 PREHOOK: type: QUERY @@ -31,8 +33,10 @@ POSTHOOK: Lineage: dest_1.value SIMPLE [(src1)src1.FieldSchema(name:value, type: POSTHOOK: Lineage: dest_1.value SIMPLE [] PREHOOK: query: create table dest_2 (key STRING, value STRING) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest_2 (key STRING, value STRING) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_2 POSTHOOK: Lineage: dest_1.key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest_1.key SIMPLE [] diff --git a/ql/src/test/results/clientpositive/mapreduce1.q.out b/ql/src/test/results/clientpositive/mapreduce1.q.out index 3fd5ffc..26d256b 100644 --- a/ql/src/test/results/clientpositive/mapreduce1.q.out +++ b/ql/src/test/results/clientpositive/mapreduce1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/mapreduce2.q.out b/ql/src/test/results/clientpositive/mapreduce2.q.out index 01ed783..2692da0 100644 --- a/ql/src/test/results/clientpositive/mapreduce2.q.out +++ b/ql/src/test/results/clientpositive/mapreduce2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/mapreduce3.q.out b/ql/src/test/results/clientpositive/mapreduce3.q.out index 7724e01..55dff7e 100644 --- a/ql/src/test/results/clientpositive/mapreduce3.q.out +++ b/ql/src/test/results/clientpositive/mapreduce3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/mapreduce4.q.out b/ql/src/test/results/clientpositive/mapreduce4.q.out index dea234d..19239fc 100644 --- a/ql/src/test/results/clientpositive/mapreduce4.q.out +++ b/ql/src/test/results/clientpositive/mapreduce4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/mapreduce5.q.out b/ql/src/test/results/clientpositive/mapreduce5.q.out index 074d22c..6e5f4e8 100644 --- a/ql/src/test/results/clientpositive/mapreduce5.q.out +++ b/ql/src/test/results/clientpositive/mapreduce5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/mapreduce6.q.out b/ql/src/test/results/clientpositive/mapreduce6.q.out index d7edf87..5ffd00d 100644 --- a/ql/src/test/results/clientpositive/mapreduce6.q.out +++ b/ql/src/test/results/clientpositive/mapreduce6.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/mapreduce7.q.out b/ql/src/test/results/clientpositive/mapreduce7.q.out index 785eeb4..60d64db 100644 --- a/ql/src/test/results/clientpositive/mapreduce7.q.out +++ b/ql/src/test/results/clientpositive/mapreduce7.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(k STRING, v STRING, key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(k STRING, v STRING, key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/mapreduce8.q.out b/ql/src/test/results/clientpositive/mapreduce8.q.out index bbccc85..825dbf4 100644 --- a/ql/src/test/results/clientpositive/mapreduce8.q.out +++ b/ql/src/test/results/clientpositive/mapreduce8.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(k STRING, v STRING, key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(k STRING, v STRING, key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/merge1.q.out b/ql/src/test/results/clientpositive/merge1.q.out index 48bbcf6..ae2939c 100644 --- a/ql/src/test/results/clientpositive/merge1.q.out +++ b/ql/src/test/results/clientpositive/merge1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table dest1(key int, val int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest1(key int, val int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: explain insert overwrite table dest1 @@ -459,15 +461,19 @@ POSTHOOK: Lineage: dest1.key EXPRESSION [(src)src.FieldSchema(name:key, type:str POSTHOOK: Lineage: dest1.val EXPRESSION [(src)src.null, ] PREHOOK: query: create table test_src(key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test_src(key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_src POSTHOOK: Lineage: dest1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest1.val EXPRESSION [(src)src.null, ] PREHOOK: query: create table dest1(key string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest1(key string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest1.val EXPRESSION [(src)src.null, ] diff --git a/ql/src/test/results/clientpositive/merge2.q.out b/ql/src/test/results/clientpositive/merge2.q.out index 3c66505..c4033eb 100644 --- a/ql/src/test/results/clientpositive/merge2.q.out +++ b/ql/src/test/results/clientpositive/merge2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table test1(key int, val int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test1(key int, val int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test1 PREHOOK: query: explain insert overwrite table test1 @@ -459,15 +461,19 @@ POSTHOOK: Lineage: test1.key EXPRESSION [(src)src.FieldSchema(name:key, type:str POSTHOOK: Lineage: test1.val EXPRESSION [(src)src.null, ] PREHOOK: query: create table test_src(key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test_src(key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_src POSTHOOK: Lineage: test1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test1.val EXPRESSION [(src)src.null, ] PREHOOK: query: create table test1(key string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test1(key string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test1 POSTHOOK: Lineage: test1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test1.val EXPRESSION [(src)src.null, ] diff --git a/ql/src/test/results/clientpositive/merge3.q.out b/ql/src/test/results/clientpositive/merge3.q.out index 3df75b7..ae7dc71 100644 --- a/ql/src/test/results/clientpositive/merge3.q.out +++ b/ql/src/test/results/clientpositive/merge3.q.out @@ -17,8 +17,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 POSTHOOK: Output: default@merge_src PREHOOK: query: create table merge_src_part (key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table merge_src_part (key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@merge_src_part PREHOOK: query: insert overwrite table merge_src_part partition(ds) select key, value, ds from srcpart where ds is not null PREHOOK: type: QUERY @@ -2375,8 +2377,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: create table merge_src_part2 like merge_src_part PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table merge_src_part2 like merge_src_part POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@merge_src_part2 POSTHOOK: Lineage: merge_src_part PARTITION(ds=2008-04-08).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: merge_src_part PARTITION(ds=2008-04-08).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] @@ -4823,8 +4827,10 @@ POSTHOOK: Lineage: merge_src_part2 PARTITION(ds=2008-04-09).key SIMPLE [(merge_s POSTHOOK: Lineage: merge_src_part2 PARTITION(ds=2008-04-09).value SIMPLE [(merge_src_part)merge_src_part.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: create table merge_src_part2 like merge_src_part PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table merge_src_part2 like merge_src_part POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@merge_src_part2 POSTHOOK: Lineage: merge_src_part PARTITION(ds=2008-04-08).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: merge_src_part PARTITION(ds=2008-04-08).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/merge4.q.out b/ql/src/test/results/clientpositive/merge4.q.out index ef4beba..3ae6098 100644 --- a/ql/src/test/results/clientpositive/merge4.q.out +++ b/ql/src/test/results/clientpositive/merge4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table nzhang_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nzhang_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part PREHOOK: query: explain insert overwrite table nzhang_part partition (ds='2010-08-15', hr) select key, value, hr from srcpart where ds='2008-04-08' diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out b/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out index 28f6389..fd99ed3 100644 --- a/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out +++ b/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out @@ -1,37 +1,49 @@ PREHOOK: query: create table srcpart_merge_dp like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart_merge_dp like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_merge_dp PREHOOK: query: create table merge_dynamic_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table merge_dynamic_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@merge_dynamic_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: explain insert overwrite table merge_dynamic_part partition (ds='2008-04-08', hr) select key, value, hr from srcpart_merge_dp where ds='2008-04-08' diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition2.q.out b/ql/src/test/results/clientpositive/merge_dynamic_partition2.q.out index 90d155b..90cdac0 100644 --- a/ql/src/test/results/clientpositive/merge_dynamic_partition2.q.out +++ b/ql/src/test/results/clientpositive/merge_dynamic_partition2.q.out @@ -1,50 +1,66 @@ PREHOOK: query: create table srcpart_merge_dp like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart_merge_dp like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_merge_dp PREHOOK: query: create table merge_dynamic_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table merge_dynamic_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@merge_dynamic_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket0.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket0.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: load data local inpath '../../data/files/srcbucket1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 POSTHOOK: query: load data local inpath '../../data/files/srcbucket1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: explain insert overwrite table merge_dynamic_part partition (ds='2008-04-08', hr) select key, value, hr from srcpart_merge_dp where ds='2008-04-08' diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition3.q.out b/ql/src/test/results/clientpositive/merge_dynamic_partition3.q.out index cd44784..d795feb 100644 --- a/ql/src/test/results/clientpositive/merge_dynamic_partition3.q.out +++ b/ql/src/test/results/clientpositive/merge_dynamic_partition3.q.out @@ -1,88 +1,116 @@ PREHOOK: query: create table srcpart_merge_dp like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart_merge_dp like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_merge_dp PREHOOK: query: create table merge_dynamic_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table merge_dynamic_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@merge_dynamic_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-09/hr=11 PREHOOK: query: load data local inpath '../../data/files/kv2.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-09/hr=11 POSTHOOK: query: load data local inpath '../../data/files/kv2.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-09/hr=11 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-09/hr=12 PREHOOK: query: load data local inpath '../../data/files/kv2.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-09/hr=12 POSTHOOK: query: load data local inpath '../../data/files/kv2.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-09/hr=12 PREHOOK: query: show partitions srcpart_merge_dp PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out b/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out index 484f964..49873dc 100644 --- a/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out +++ b/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out @@ -3,16 +3,20 @@ PREHOOK: query: -- this test verifies that the block merge task that can follow create table srcpart_merge_dp like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- this test verifies that the block merge task that can follow a query to generate dynamic -- partitions does not produce incorrect results by dropping partitions create table srcpart_merge_dp like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_merge_dp PREHOOK: query: create table srcpart_merge_dp_rc like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart_merge_dp_rc like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_merge_dp_rc PREHOOK: query: alter table srcpart_merge_dp_rc set fileformat RCFILE PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -24,8 +28,10 @@ POSTHOOK: Input: default@srcpart_merge_dp_rc POSTHOOK: Output: default@srcpart_merge_dp_rc PREHOOK: query: create table merge_dynamic_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table merge_dynamic_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@merge_dynamic_part PREHOOK: query: alter table merge_dynamic_part set fileformat RCFILE PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -37,53 +43,69 @@ POSTHOOK: Input: default@merge_dynamic_part POSTHOOK: Output: default@merge_dynamic_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: insert overwrite table srcpart_merge_dp_rc partition (ds = '2008-04-08', hr) select key, value, hr from srcpart_merge_dp where ds = '2008-04-08' diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out b/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out index 77a750d..f9ec3af 100644 --- a/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out +++ b/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out @@ -2,15 +2,19 @@ PREHOOK: query: -- this is to test the case where some dynamic partitions are me create table srcpart_merge_dp like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- this is to test the case where some dynamic partitions are merged and some are moved create table srcpart_merge_dp like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_merge_dp PREHOOK: query: create table srcpart_merge_dp_rc like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart_merge_dp_rc like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_merge_dp_rc PREHOOK: query: alter table srcpart_merge_dp_rc set fileformat RCFILE PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -22,8 +26,10 @@ POSTHOOK: Input: default@srcpart_merge_dp_rc POSTHOOK: Output: default@srcpart_merge_dp_rc PREHOOK: query: create table merge_dynamic_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table merge_dynamic_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@merge_dynamic_part PREHOOK: query: alter table merge_dynamic_part set fileformat RCFILE PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -35,34 +41,44 @@ POSTHOOK: Input: default@merge_dynamic_part POSTHOOK: Output: default@merge_dynamic_part PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_merge_dp POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_merge_dp POSTHOOK: Output: default@srcpart_merge_dp@ds=2008-04-08/hr=12 PREHOOK: query: insert overwrite table srcpart_merge_dp_rc partition (ds = '2008-04-08', hr) diff --git a/ql/src/test/results/clientpositive/mergejoins.q.out b/ql/src/test/results/clientpositive/mergejoins.q.out index 4f6fc87..8c65394 100644 --- a/ql/src/test/results/clientpositive/mergejoins.q.out +++ b/ql/src/test/results/clientpositive/mergejoins.q.out @@ -1,27 +1,37 @@ PREHOOK: query: create table a (val1 int, val2 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table a (val1 int, val2 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@a PREHOOK: query: create table b (val1 int, val2 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table b (val1 int, val2 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@b PREHOOK: query: create table c (val1 int, val2 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table c (val1 int, val2 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@c PREHOOK: query: create table d (val1 int, val2 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table d (val1 int, val2 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@d PREHOOK: query: create table e (val1 int, val2 int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table e (val1 int, val2 int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e PREHOOK: query: explain select * from a join b on a.val1=b.val1 join c on a.val1=c.val1 join d on a.val1=d.val1 join e on a.val2=e.val2 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/mergejoins_mixed.q.out b/ql/src/test/results/clientpositive/mergejoins_mixed.q.out index 4e16fbd..009efeb 100644 --- a/ql/src/test/results/clientpositive/mergejoins_mixed.q.out +++ b/ql/src/test/results/clientpositive/mergejoins_mixed.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- HIVE-3464 create table a (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-3464 create table a (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@a PREHOOK: query: -- (a-b-c-d) explain diff --git a/ql/src/test/results/clientpositive/metadata_export_drop.q.out b/ql/src/test/results/clientpositive/metadata_export_drop.q.out index 260c171..e70860b 100644 --- a/ql/src/test/results/clientpositive/metadata_export_drop.q.out +++ b/ql/src/test/results/clientpositive/metadata_export_drop.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tmp_meta_export_listener_drop_test (foo string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp_meta_export_listener_drop_test (foo string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_meta_export_listener_drop_test PREHOOK: query: drop table tmp_meta_export_listener_drop_test PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/metadata_only_queries.q.out b/ql/src/test/results/clientpositive/metadata_only_queries.q.out index fea4a11..cf1148d 100644 --- a/ql/src/test/results/clientpositive/metadata_only_queries.q.out +++ b/ql/src/test/results/clientpositive/metadata_only_queries.q.out @@ -13,6 +13,7 @@ PREHOOK: query: create table over10k( row format delimited fields terminated by '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table over10k( t tinyint, si smallint, @@ -28,12 +29,15 @@ POSTHOOK: query: create table over10k( row format delimited fields terminated by '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@over10k PREHOOK: query: load data local inpath '../../data/files/over10k' into table over10k PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@over10k POSTHOOK: query: load data local inpath '../../data/files/over10k' into table over10k POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@over10k PREHOOK: query: create table stats_tbl( t tinyint, @@ -48,6 +52,7 @@ PREHOOK: query: create table stats_tbl( dec decimal, bin binary) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_tbl( t tinyint, si smallint, @@ -61,6 +66,7 @@ POSTHOOK: query: create table stats_tbl( dec decimal, bin binary) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_tbl PREHOOK: query: create table stats_tbl_part( t tinyint, @@ -75,6 +81,7 @@ PREHOOK: query: create table stats_tbl_part( dec decimal, bin binary) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_tbl_part( t tinyint, si smallint, @@ -88,6 +95,7 @@ POSTHOOK: query: create table stats_tbl_part( dec decimal, bin binary) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_tbl_part PREHOOK: query: insert overwrite table stats_tbl select * from over10k PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out b/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out index 01dbf3d..099e12c 100644 --- a/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out +++ b/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out @@ -13,6 +13,7 @@ PREHOOK: query: create table over10k( row format delimited fields terminated by '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table over10k( t tinyint, si smallint, @@ -28,12 +29,15 @@ POSTHOOK: query: create table over10k( row format delimited fields terminated by '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@over10k PREHOOK: query: load data local inpath '../../data/files/over10k' into table over10k PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@over10k POSTHOOK: query: load data local inpath '../../data/files/over10k' into table over10k POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@over10k PREHOOK: query: create table stats_tbl_part( t tinyint, @@ -48,6 +52,7 @@ PREHOOK: query: create table stats_tbl_part( dec decimal, bin binary) partitioned by (dt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_tbl_part( t tinyint, si smallint, @@ -61,6 +66,7 @@ POSTHOOK: query: create table stats_tbl_part( dec decimal, bin binary) partitioned by (dt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_tbl_part PREHOOK: query: from over10k insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,dec,bin where t>0 and t<30 diff --git a/ql/src/test/results/clientpositive/metadataonly1.q.out b/ql/src/test/results/clientpositive/metadataonly1.q.out index fc6e9e5..9e17b6f 100644 --- a/ql/src/test/results/clientpositive/metadataonly1.q.out +++ b/ql/src/test/results/clientpositive/metadataonly1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE TEST1(A INT, B DOUBLE) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TEST1(A INT, B DOUBLE) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TEST1 PREHOOK: query: explain extended select max(ds) from TEST1 PREHOOK: type: QUERY @@ -81,10 +83,10 @@ POSTHOOK: Input: default@test1 NULL PREHOOK: query: alter table TEST1 add partition (ds='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test1 +PREHOOK: Output: default@test1 POSTHOOK: query: alter table TEST1 add partition (ds='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test1 +POSTHOOK: Output: default@test1 POSTHOOK: Output: default@test1@ds=1 PREHOOK: query: explain extended select max(ds) from TEST1 PREHOOK: type: QUERY @@ -504,10 +506,10 @@ POSTHOOK: Input: default@test1@ds=1 0 PREHOOK: query: alter table TEST1 add partition (ds='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test1 +PREHOOK: Output: default@test1 POSTHOOK: query: alter table TEST1 add partition (ds='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test1 +POSTHOOK: Output: default@test1 POSTHOOK: Output: default@test1@ds=2 PREHOOK: query: explain extended select count(*) from TEST1 a2 join (select max(ds) m from TEST1) b on a2.ds=b.m @@ -938,29 +940,31 @@ POSTHOOK: Input: default@test1@ds=2 0 PREHOOK: query: CREATE TABLE TEST2(A INT, B DOUBLE) partitioned by (ds string, hr string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TEST2(A INT, B DOUBLE) partitioned by (ds string, hr string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TEST2 PREHOOK: query: alter table TEST2 add partition (ds='1', hr='1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test2 +PREHOOK: Output: default@test2 POSTHOOK: query: alter table TEST2 add partition (ds='1', hr='1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test2 +POSTHOOK: Output: default@test2 POSTHOOK: Output: default@test2@ds=1/hr=1 PREHOOK: query: alter table TEST2 add partition (ds='1', hr='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test2 +PREHOOK: Output: default@test2 POSTHOOK: query: alter table TEST2 add partition (ds='1', hr='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test2 +POSTHOOK: Output: default@test2 POSTHOOK: Output: default@test2@ds=1/hr=2 PREHOOK: query: alter table TEST2 add partition (ds='1', hr='3') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test2 +PREHOOK: Output: default@test2 POSTHOOK: query: alter table TEST2 add partition (ds='1', hr='3') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test2 +POSTHOOK: Output: default@test2 POSTHOOK: Output: default@test2@ds=1/hr=3 PREHOOK: query: explain extended select ds, count(distinct hr) from TEST2 group by ds PREHOOK: type: QUERY @@ -1637,18 +1641,18 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 PREHOOK: query: -- HIVE-3594 URI encoding for temporary path alter table TEST2 add partition (ds='01:10:10', hr='01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test2 +PREHOOK: Output: default@test2 POSTHOOK: query: -- HIVE-3594 URI encoding for temporary path alter table TEST2 add partition (ds='01:10:10', hr='01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test2 +POSTHOOK: Output: default@test2 POSTHOOK: Output: default@test2@ds=01%3A10%3A10/hr=01 PREHOOK: query: alter table TEST2 add partition (ds='01:10:20', hr='02') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@test2 +PREHOOK: Output: default@test2 POSTHOOK: query: alter table TEST2 add partition (ds='01:10:20', hr='02') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@test2 +POSTHOOK: Output: default@test2 POSTHOOK: Output: default@test2@ds=01%3A10%3A20/hr=02 PREHOOK: query: explain extended select ds, count(distinct hr) from TEST2 group by ds PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/mi.q.out b/ql/src/test/results/clientpositive/mi.q.out index b1831d5..1421345 100644 --- a/ql/src/test/results/clientpositive/mi.q.out +++ b/ql/src/test/results/clientpositive/mi.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table nzhang_t1 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nzhang_t1 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_t1 PREHOOK: query: create table nzhang_t2 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nzhang_t2 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_t2 PREHOOK: query: FROM srcpart INSERT OVERWRITE TABLE nzhang_t1 PARTITION (ds, hr) diff --git a/ql/src/test/results/clientpositive/misc_json.q.out b/ql/src/test/results/clientpositive/misc_json.q.out index 42d3ace..eddfa29 100644 --- a/ql/src/test/results/clientpositive/misc_json.q.out +++ b/ql/src/test/results/clientpositive/misc_json.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE IF NOT EXISTS jsontable (key INT, value STRING) COMMENT 'json table' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE IF NOT EXISTS jsontable (key INT, value STRING) COMMENT 'json table' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@jsontable PREHOOK: query: ALTER TABLE jsontable ADD COLUMNS (name STRING COMMENT 'a new column') PREHOOK: type: ALTERTABLE_ADDCOLS diff --git a/ql/src/test/results/clientpositive/multiMapJoin1.q.out b/ql/src/test/results/clientpositive/multiMapJoin1.q.out index 8d888a2..039a7ee 100644 --- a/ql/src/test/results/clientpositive/multiMapJoin1.q.out +++ b/ql/src/test/results/clientpositive/multiMapJoin1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table smallTbl1(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smallTbl1(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smallTbl1 PREHOOK: query: insert overwrite table smallTbl1 select * from src where key < 10 PREHOOK: type: QUERY @@ -15,8 +17,10 @@ POSTHOOK: Lineage: smalltbl1.key SIMPLE [(src)src.FieldSchema(name:key, type:str POSTHOOK: Lineage: smalltbl1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table smallTbl2(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smallTbl2(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smallTbl2 POSTHOOK: Lineage: smalltbl1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: smalltbl1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -34,8 +38,10 @@ POSTHOOK: Lineage: smalltbl2.key SIMPLE [(src)src.FieldSchema(name:key, type:str POSTHOOK: Lineage: smalltbl2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table smallTbl3(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smallTbl3(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smallTbl3 POSTHOOK: Lineage: smalltbl1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: smalltbl1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -57,8 +63,10 @@ POSTHOOK: Lineage: smalltbl3.key SIMPLE [(src)src.FieldSchema(name:key, type:str POSTHOOK: Lineage: smalltbl3.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table smallTbl4(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smallTbl4(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smallTbl4 POSTHOOK: Lineage: smalltbl1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: smalltbl1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -84,8 +92,10 @@ POSTHOOK: Lineage: smalltbl4.key SIMPLE [(src)src.FieldSchema(name:key, type:str POSTHOOK: Lineage: smalltbl4.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table bigTbl(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bigTbl(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bigTbl POSTHOOK: Lineage: smalltbl1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: smalltbl1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -653,8 +663,10 @@ POSTHOOK: Lineage: smalltbl4.key SIMPLE [(src)src.FieldSchema(name:key, type:str POSTHOOK: Lineage: smalltbl4.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table bigTbl(key1 string, key2 string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bigTbl(key1 string, key2 string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bigTbl POSTHOOK: Lineage: bigtbl.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), (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), (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), (src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: bigtbl.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/multiMapJoin2.q.out b/ql/src/test/results/clientpositive/multiMapJoin2.q.out index c59a407..19122b7 100644 --- a/ql/src/test/results/clientpositive/multiMapJoin2.q.out +++ b/ql/src/test/results/clientpositive/multiMapJoin2.q.out @@ -1913,9 +1913,11 @@ POSTHOOK: Input: default@src1 PREHOOK: query: -- Check if we can correctly handle partitioned table. CREATE TABLE part_table(key string, value string) PARTITIONED BY (partitionId int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Check if we can correctly handle partitioned table. CREATE TABLE part_table(key string, value string) PARTITIONED BY (partitionId int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_table PREHOOK: query: INSERT OVERWRITE TABLE part_table PARTITION (partitionId=1) SELECT key, value FROM src ORDER BY key, value LIMIT 100 diff --git a/ql/src/test/results/clientpositive/multi_insert.q.out b/ql/src/test/results/clientpositive/multi_insert.q.out index 4124e45..2065a12 100644 --- a/ql/src/test/results/clientpositive/multi_insert.q.out +++ b/ql/src/test/results/clientpositive/multi_insert.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table src_multi1 like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_multi1 like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_multi1 PREHOOK: query: create table src_multi2 like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_multi2 like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_multi2 PREHOOK: query: explain from src diff --git a/ql/src/test/results/clientpositive/multi_insert_gby.q.out b/ql/src/test/results/clientpositive/multi_insert_gby.q.out index 28ab667..ab8fe48 100644 --- a/ql/src/test/results/clientpositive/multi_insert_gby.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_gby.q.out @@ -1,14 +1,18 @@ PREHOOK: query: --HIVE-3699 Multiple insert overwrite into multiple tables query stores same results in all tables create table e1 (key string, count int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: --HIVE-3699 Multiple insert overwrite into multiple tables query stores same results in all tables create table e1 (key string, count int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e1 PREHOOK: query: create table e2 (key string, count int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table e2 (key string, count int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e2 PREHOOK: query: explain FROM src INSERT OVERWRITE TABLE e1 diff --git a/ql/src/test/results/clientpositive/multi_insert_gby2.q.out b/ql/src/test/results/clientpositive/multi_insert_gby2.q.out index 1f1f751..ab758cb 100644 --- a/ql/src/test/results/clientpositive/multi_insert_gby2.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_gby2.q.out @@ -1,14 +1,18 @@ PREHOOK: query: --HIVE-3699 Multiple insert overwrite into multiple tables query stores same results in all tables create table e1 (count int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: --HIVE-3699 Multiple insert overwrite into multiple tables query stores same results in all tables create table e1 (count int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e1 PREHOOK: query: create table e2 (percentile double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table e2 (percentile double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e2 PREHOOK: query: explain FROM (select key, cast(key as double) as value from src order by key) a diff --git a/ql/src/test/results/clientpositive/multi_insert_gby3.q.out b/ql/src/test/results/clientpositive/multi_insert_gby3.q.out index e16273b..23ccebb 100644 --- a/ql/src/test/results/clientpositive/multi_insert_gby3.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_gby3.q.out @@ -1,17 +1,23 @@ PREHOOK: query: create table e1 (key string, keyD double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table e1 (key string, keyD double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e1 PREHOOK: query: create table e2 (key string, keyD double, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table e2 (key string, keyD double, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e2 PREHOOK: query: create table e3 (key string, keyD double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table e3 (key string, keyD double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@e3 PREHOOK: query: explain FROM (select key, cast(key as double) as keyD, value from src order by key) a diff --git a/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out b/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out index 05cb37c..35e70b4 100644 --- a/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out @@ -7,18 +7,24 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@src_10 PREHOOK: query: create table src_lv1 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_lv1 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_lv1 PREHOOK: query: create table src_lv2 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_lv2 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_lv2 PREHOOK: query: create table src_lv3 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_lv3 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_lv3 PREHOOK: query: -- 2LV -- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[11]-FS[12] @@ -1441,8 +1447,10 @@ val_86 86.0 val_98 98.0 PREHOOK: query: create table src_lv4 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_lv4 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_lv4 POSTHOOK: Lineage: src_lv1.key SCRIPT [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: src_lv1.key SCRIPT [(src_10)src_10.FieldSchema(name:key, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out b/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out index 987ae94..86118d4 100644 --- a/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table src_multi1 like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_multi1 like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_multi1 PREHOOK: query: create table src_multi2 like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_multi2 like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_multi2 PREHOOK: query: explain from src diff --git a/ql/src/test/results/clientpositive/multi_sahooks.q.out b/ql/src/test/results/clientpositive/multi_sahooks.q.out index 6dc8e2b..14f0eeb 100644 --- a/ql/src/test/results/clientpositive/multi_sahooks.q.out +++ b/ql/src/test/results/clientpositive/multi_sahooks.q.out @@ -6,8 +6,10 @@ DummySemanticAnalyzerHook1 Pre: Count 0 DummySemanticAnalyzerHook1 Post: Hive rocks!! Count: 0 PREHOOK: query: create table tbl_sahook (c string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_sahook (c string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_sahook PREHOOK: query: desc extended tbl_sahook PREHOOK: type: DESCTABLE @@ -32,8 +34,10 @@ DummySemanticAnalyzerHook1 Pre: Count 0 DummySemanticAnalyzerHook1 Post: Hive rocks!! Count: 0 PREHOOK: query: create table tbl_sahooks (c string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_sahooks (c string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_sahooks PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE @@ -58,8 +62,10 @@ DummySemanticAnalyzerHook1 Pre: Count 0 DummySemanticAnalyzerHook1 Post: Hive rocks!! Count: 0 PREHOOK: query: create table tbl_sahooks (c string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_sahooks (c string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_sahooks PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE @@ -86,8 +92,10 @@ DummySemanticAnalyzerHook1 Post: Hive rocks!! Count: 0 DummySemanticAnalyzerHook1 Post: Hive rocks!! Count: 1 PREHOOK: query: create table tbl_sahooks (c string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl_sahooks (c string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl_sahooks PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/multigroupby_singlemr.q.out b/ql/src/test/results/clientpositive/multigroupby_singlemr.q.out index 9002cfa..5dbb96f 100644 --- a/ql/src/test/results/clientpositive/multigroupby_singlemr.q.out +++ b/ql/src/test/results/clientpositive/multigroupby_singlemr.q.out @@ -1,27 +1,37 @@ PREHOOK: query: CREATE TABLE TBL(C1 INT, C2 INT, C3 INT, C4 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE TBL(C1 INT, C2 INT, C3 INT, C4 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@TBL PREHOOK: query: CREATE TABLE DEST1(d1 INT, d2 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(d1 INT, d2 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(d1 INT, d2 INT, d3 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(d1 INT, d2 INT, d3 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: CREATE TABLE DEST3(d1 INT, d2 INT, d3 INT, d4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST3(d1 INT, d2 INT, d3 INT, d4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST3 PREHOOK: query: CREATE TABLE DEST4(d1 INT, d2 INT, d3 INT, d4 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST4(d1 INT, d2 INT, d3 INT, d4 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST4 PREHOOK: query: EXPLAIN FROM TBL diff --git a/ql/src/test/results/clientpositive/nested_complex.q.out b/ql/src/test/results/clientpositive/nested_complex.q.out index 1849afc..5c3fdac 100644 --- a/ql/src/test/results/clientpositive/nested_complex.q.out +++ b/ql/src/test/results/clientpositive/nested_complex.q.out @@ -11,6 +11,7 @@ WITH SERDEPROPERTIES ( 'line.delim'='\n' ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nestedcomplex ( simple_int int, max_nested_array array>>>>>>>>>>>>>>>>>>>>>>, @@ -24,6 +25,7 @@ WITH SERDEPROPERTIES ( 'line.delim'='\n' ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nestedcomplex PREHOOK: query: describe nestedcomplex PREHOOK: type: DESCTABLE @@ -47,9 +49,11 @@ simple_string string None #### A masked pattern was here #### PREHOOK: query: load data local inpath '../../data/files/nested_complex.txt' overwrite into table nestedcomplex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@nestedcomplex POSTHOOK: query: load data local inpath '../../data/files/nested_complex.txt' overwrite into table nestedcomplex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@nestedcomplex PREHOOK: query: select * from nestedcomplex sort by simple_int PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/nestedvirtual.q.out b/ql/src/test/results/clientpositive/nestedvirtual.q.out index 4e6a2ef..b56a7d8 100644 --- a/ql/src/test/results/clientpositive/nestedvirtual.q.out +++ b/ql/src/test/results/clientpositive/nestedvirtual.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE pokes (foo INT, bar STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE pokes (foo INT, bar STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pokes PREHOOK: query: create table pokes2(foo INT, bar STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table pokes2(foo INT, bar STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pokes2 PREHOOK: query: create table jssarma_nilzma_bad as select a.val, a.filename, a.offset from (select hash(foo) as val, INPUT__FILE__NAME as filename, BLOCK__OFFSET__INSIDE__FILE as offset from pokes) a join pokes2 b on (a.val = b.foo) PREHOOK: type: CREATETABLE_AS_SELECT @@ -43,13 +47,17 @@ POSTHOOK: Input: default@pokes2 POSTHOOK: Output: default@pokes2 PREHOOK: query: CREATE TABLE pokes (foo INT, bar STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE pokes (foo INT, bar STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pokes PREHOOK: query: create table pokes2(foo INT, bar STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table pokes2(foo INT, bar STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pokes2 PREHOOK: query: create table jssarma_nilzma_bad as select a.val, a.filename, a.offset from (select hash(foo) as val, INPUT__FILE__NAME as filename, BLOCK__OFFSET__INSIDE__FILE as offset from pokes) a join pokes2 b on (a.val = b.foo) PREHOOK: type: CREATETABLE_AS_SELECT @@ -86,13 +94,17 @@ POSTHOOK: Input: default@pokes2 POSTHOOK: Output: default@pokes2 PREHOOK: query: CREATE TABLE pokes (foo INT, bar STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE pokes (foo INT, bar STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pokes PREHOOK: query: create table pokes2(foo INT, bar STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table pokes2(foo INT, bar STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pokes2 PREHOOK: query: create table jssarma_nilzma_bad as select a.val, a.filename, a.offset from (select hash(foo) as val, INPUT__FILE__NAME as filename, BLOCK__OFFSET__INSIDE__FILE as offset from pokes) a join pokes2 b on (a.val = b.foo) PREHOOK: type: CREATETABLE_AS_SELECT diff --git a/ql/src/test/results/clientpositive/newline.q.out b/ql/src/test/results/clientpositive/newline.q.out index da21e87..3993907 100644 --- a/ql/src/test/results/clientpositive/newline.q.out +++ b/ql/src/test/results/clientpositive/newline.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tmp_tmp(key string, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp_tmp(key string, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_tmp PREHOOK: query: insert overwrite table tmp_tmp SELECT TRANSFORM(key, value) USING @@ -49,8 +51,10 @@ POSTHOOK: Lineage: tmp_tmp.key SCRIPT [(src)src.FieldSchema(name:key, type:strin POSTHOOK: Lineage: tmp_tmp.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table tmp_tmp(key string, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp_tmp(key string, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_tmp POSTHOOK: Lineage: tmp_tmp.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: tmp_tmp.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out b/ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out index 1377a1a..d038be4 100644 --- a/ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out +++ b/ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out @@ -8,8 +8,10 @@ drop table ambiguous POSTHOOK: type: DROPTABLE PREHOOK: query: create table ambiguous (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ambiguous (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ambiguous PREHOOK: query: FROM src key INSERT OVERWRITE TABLE ambiguous SELECT key.key, key.value WHERE key.value < 'val_100' diff --git a/ql/src/test/results/clientpositive/nonreserved_keywords_input37.q.out b/ql/src/test/results/clientpositive/nonreserved_keywords_input37.q.out index 1d1ce79..487ac94 100644 --- a/ql/src/test/results/clientpositive/nonreserved_keywords_input37.q.out +++ b/ql/src/test/results/clientpositive/nonreserved_keywords_input37.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE table(string string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table(string string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/docurl.txt' INTO TABLE table PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@table POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/docurl.txt' INTO TABLE table POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@table PREHOOK: query: SELECT table, count(1) FROM diff --git a/ql/src/test/results/clientpositive/nonreserved_keywords_insert_into1.q.out b/ql/src/test/results/clientpositive/nonreserved_keywords_insert_into1.q.out index b702d91..5d5b7c1 100644 --- a/ql/src/test/results/clientpositive/nonreserved_keywords_insert_into1.q.out +++ b/ql/src/test/results/clientpositive/nonreserved_keywords_insert_into1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: DROP TABLE insert POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert (key INT, as STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE insert (key INT, as STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@insert PREHOOK: query: EXPLAIN INSERT INTO TABLE insert SELECT * FROM src LIMIT 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/notable_alias1.q.out b/ql/src/test/results/clientpositive/notable_alias1.q.out index e1dd01e..bad1794 100644 --- a/ql/src/test/results/clientpositive/notable_alias1.q.out +++ b/ql/src/test/results/clientpositive/notable_alias1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(dummy STRING, key INT, value DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(dummy STRING, key INT, value DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/notable_alias2.q.out b/ql/src/test/results/clientpositive/notable_alias2.q.out index 592b530..078ee0f 100644 --- a/ql/src/test/results/clientpositive/notable_alias2.q.out +++ b/ql/src/test/results/clientpositive/notable_alias2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(dummy STRING, key INT, value DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(dummy STRING, key INT, value DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/notable_alias3.q.out b/ql/src/test/results/clientpositive/notable_alias3.q.out index ab809a4..cd40469 100644 --- a/ql/src/test/results/clientpositive/notable_alias3.q.out +++ b/ql/src/test/results/clientpositive/notable_alias3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c string, key INT, value DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c string, key INT, value DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT '1234', src.key, sum(src.value) WHERE src.key < 100 group by key diff --git a/ql/src/test/results/clientpositive/null_column.q.out b/ql/src/test/results/clientpositive/null_column.q.out index ae88ae7..377afde 100644 --- a/ql/src/test/results/clientpositive/null_column.q.out +++ b/ql/src/test/results/clientpositive/null_column.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table temp_null(a int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table temp_null(a int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@temp_null PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table temp_null PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@temp_null POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table temp_null POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@temp_null PREHOOK: query: select null, null from temp_null PREHOOK: type: QUERY @@ -25,8 +29,10 @@ NULL NULL NULL NULL PREHOOK: query: create table tt(a int, b string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tt(a int, b string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tt PREHOOK: query: insert overwrite table tt select null, null from temp_null PREHOOK: type: QUERY @@ -56,8 +62,10 @@ NULL NULL NULL NULL PREHOOK: query: create table tt_b(a int, b string) row format serde "org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe" PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tt_b(a int, b string) row format serde "org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe" POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tt_b POSTHOOK: Lineage: tt.a EXPRESSION [] POSTHOOK: Lineage: tt.b SIMPLE [] @@ -111,8 +119,10 @@ POSTHOOK: Lineage: tt_b.b EXPRESSION [] \N\N PREHOOK: query: create table temp_null2 (key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table temp_null2 (key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@temp_null2 POSTHOOK: Lineage: tt.a EXPRESSION [] POSTHOOK: Lineage: tt.b SIMPLE [] diff --git a/ql/src/test/results/clientpositive/nullformat.q.out b/ql/src/test/results/clientpositive/nullformat.q.out index f3bde00..7ea1e95 100644 --- a/ql/src/test/results/clientpositive/nullformat.q.out +++ b/ql/src/test/results/clientpositive/nullformat.q.out @@ -6,14 +6,18 @@ DROP TABLE IF EXISTS base_tab POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE base_tab(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE base_tab(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@base_tab PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE base_tab PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@base_tab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE base_tab POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@base_tab PREHOOK: query: DESCRIBE EXTENDED base_tab PREHOOK: type: DESCTABLE @@ -49,8 +53,10 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE null_tab1(a STRING, b STRING) ROW FORMAT DELIMITED NULL DEFINED AS 'fooNull' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE null_tab1(a STRING, b STRING) ROW FORMAT DELIMITED NULL DEFINED AS 'fooNull' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@null_tab1 PREHOOK: query: DESCRIBE EXTENDED null_tab1 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/nullformatCTAS.q.out b/ql/src/test/results/clientpositive/nullformatCTAS.q.out index df997ce..1c64658 100644 --- a/ql/src/test/results/clientpositive/nullformatCTAS.q.out +++ b/ql/src/test/results/clientpositive/nullformatCTAS.q.out @@ -6,14 +6,18 @@ DROP TABLE IF EXISTS base_tab POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE base_tab(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE base_tab(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@base_tab PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE base_tab PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@base_tab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE base_tab POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@base_tab PREHOOK: query: DESCRIBE EXTENDED base_tab PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/nullformatdir.q.out b/ql/src/test/results/clientpositive/nullformatdir.q.out index 175a26f..f052726 100644 --- a/ql/src/test/results/clientpositive/nullformatdir.q.out +++ b/ql/src/test/results/clientpositive/nullformatdir.q.out @@ -6,14 +6,18 @@ DROP TABLE IF EXISTS base_tab POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE base_tab(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE base_tab(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@base_tab PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE base_tab PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@base_tab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE base_tab POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@base_tab PREHOOK: query: DESCRIBE EXTENDED base_tab PREHOOK: type: DESCTABLE @@ -51,14 +55,18 @@ DROP TABLE IF EXISTS null_tab2 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE null_tab2(a STRING, b STRING) ROW FORMAT DELIMITED NULL DEFINED AS 'fooNull' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE null_tab2(a STRING, b STRING) ROW FORMAT DELIMITED NULL DEFINED AS 'fooNull' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@null_tab2 #### A masked pattern was here #### PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@null_tab2 #### A masked pattern was here #### POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@null_tab2 PREHOOK: query: SELECT * FROM null_tab2 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/nullgroup3.q.out b/ql/src/test/results/clientpositive/nullgroup3.q.out index 1dee25e..96b480c 100644 --- a/ql/src/test/results/clientpositive/nullgroup3.q.out +++ b/ql/src/test/results/clientpositive/nullgroup3.q.out @@ -1,20 +1,26 @@ PREHOOK: query: CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstparttbl PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl POSTHOOK: Output: default@tstparttbl@ds=2008-04-09 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl POSTHOOK: Output: default@tstparttbl@ds=2008-04-08 PREHOOK: query: explain @@ -82,21 +88,27 @@ POSTHOOK: Input: default@tstparttbl@ds=2008-04-09 500 PREHOOK: query: CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstparttbl2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl2 POSTHOOK: Output: default@tstparttbl2@ds=2008-04-09 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl2 POSTHOOK: Output: default@tstparttbl2@ds=2008-04-08 PREHOOK: query: explain @@ -172,21 +184,27 @@ POSTHOOK: Input: default@tstparttbl POSTHOOK: Output: default@tstparttbl PREHOOK: query: CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstparttbl PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl POSTHOOK: Output: default@tstparttbl@ds=2008-04-09 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl POSTHOOK: Output: default@tstparttbl@ds=2008-04-08 PREHOOK: query: explain @@ -262,21 +280,27 @@ POSTHOOK: Input: default@tstparttbl2 POSTHOOK: Output: default@tstparttbl2 PREHOOK: query: CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstparttbl2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl2 POSTHOOK: Output: default@tstparttbl2@ds=2008-04-09 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl2 POSTHOOK: Output: default@tstparttbl2@ds=2008-04-08 PREHOOK: query: explain diff --git a/ql/src/test/results/clientpositive/nullgroup5.q.out b/ql/src/test/results/clientpositive/nullgroup5.q.out index 5a4d187..4f0940b 100644 --- a/ql/src/test/results/clientpositive/nullgroup5.q.out +++ b/ql/src/test/results/clientpositive/nullgroup5.q.out @@ -1,25 +1,33 @@ PREHOOK: query: CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstparttbl PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2009-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2009-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl POSTHOOK: Output: default@tstparttbl@ds=2009-04-09 PREHOOK: query: CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstparttbl2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl2 PARTITION (ds='2009-04-09') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tstparttbl2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl2 PARTITION (ds='2009-04-09') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tstparttbl2 POSTHOOK: Output: default@tstparttbl2@ds=2009-04-09 PREHOOK: query: explain diff --git a/ql/src/test/results/clientpositive/nullinput.q.out b/ql/src/test/results/clientpositive/nullinput.q.out index bedc5de..db70faa 100644 --- a/ql/src/test/results/clientpositive/nullinput.q.out +++ b/ql/src/test/results/clientpositive/nullinput.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tstnullinut(a string, b string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstnullinut(a string, b string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstnullinut PREHOOK: query: select x.* from tstnullinut x PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/nullinput2.q.out b/ql/src/test/results/clientpositive/nullinput2.q.out index af0bec5..25c8221 100644 --- a/ql/src/test/results/clientpositive/nullinput2.q.out +++ b/ql/src/test/results/clientpositive/nullinput2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table nulltbl(key int) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nulltbl(key int) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nulltbl PREHOOK: query: select key from nulltbl where ds='101' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/nullscript.q.out b/ql/src/test/results/clientpositive/nullscript.q.out index ec8c5e8..3b36346 100644 --- a/ql/src/test/results/clientpositive/nullscript.q.out +++ b/ql/src/test/results/clientpositive/nullscript.q.out @@ -1,19 +1,25 @@ PREHOOK: query: CREATE TABLE nullscript(KEY STRING, VALUE STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE nullscript(KEY STRING, VALUE STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nullscript PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE nullscript PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@nullscript POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE nullscript POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@nullscript PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE nullscript PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@nullscript POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE nullscript POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@nullscript PREHOOK: query: explain select transform(key) using 'cat' as key1 from nullscript diff --git a/ql/src/test/results/clientpositive/orc_create.q.out b/ql/src/test/results/clientpositive/orc_create.q.out index 259520e..4dd0a87 100644 --- a/ql/src/test/results/clientpositive/orc_create.q.out +++ b/ql/src/test/results/clientpositive/orc_create.q.out @@ -28,6 +28,7 @@ PREHOOK: query: CREATE TABLE orc_create_staging ( COLLECTION ITEMS TERMINATED BY ',' MAP KEYS TERMINATED BY ':' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE orc_create_staging ( str STRING, mp MAP, @@ -38,6 +39,7 @@ POSTHOOK: query: CREATE TABLE orc_create_staging ( COLLECTION ITEMS TERMINATED BY ',' MAP KEYS TERMINATED BY ':' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_create_staging PREHOOK: query: DESCRIBE FORMATTED orc_create_staging PREHOOK: type: DESCTABLE @@ -77,10 +79,12 @@ PREHOOK: query: CREATE TABLE orc_create (key INT, value STRING) PARTITIONED BY (ds string) STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE orc_create (key INT, value STRING) PARTITIONED BY (ds string) STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_create PREHOOK: query: DESCRIBE FORMATTED orc_create PREHOOK: type: DESCTABLE @@ -127,9 +131,11 @@ POSTHOOK: Output: default@orc_create PREHOOK: query: CREATE TABLE orc_create (key INT, value STRING) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE orc_create (key INT, value STRING) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_create PREHOOK: query: DESCRIBE FORMATTED orc_create PREHOOK: type: DESCTABLE @@ -218,9 +224,11 @@ POSTHOOK: Output: default@orc_create PREHOOK: query: CREATE TABLE orc_create (key INT, value STRING) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE orc_create (key INT, value STRING) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_create PREHOOK: query: DESCRIBE FORMATTED orc_create PREHOOK: type: DESCTABLE @@ -263,6 +271,7 @@ PREHOOK: query: CREATE TABLE orc_create_complex ( strct STRUCT ) STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE orc_create_complex ( str STRING, mp MAP, @@ -270,6 +279,7 @@ POSTHOOK: query: CREATE TABLE orc_create_complex ( strct STRUCT ) STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_create_complex PREHOOK: query: DESCRIBE FORMATTED orc_create_complex PREHOOK: type: DESCTABLE @@ -304,9 +314,11 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/orc_create.txt' OVERWRITE INTO TABLE orc_create_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@orc_create_staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/orc_create.txt' OVERWRITE INTO TABLE orc_create_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@orc_create_staging PREHOOK: query: SELECT * from orc_create_staging PREHOOK: type: QUERY @@ -413,6 +425,7 @@ PREHOOK: query: CREATE TABLE orc_create_people_staging ( address string, state string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE orc_create_people_staging ( id int, first_name string, @@ -420,6 +433,7 @@ POSTHOOK: query: CREATE TABLE orc_create_people_staging ( address string, state string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_create_people_staging POSTHOOK: Lineage: orc_create_complex.lst SIMPLE [(orc_create_staging)orc_create_staging.FieldSchema(name:lst, type:array, comment:null), ] POSTHOOK: Lineage: orc_create_complex.mp SIMPLE [(orc_create_staging)orc_create_staging.FieldSchema(name:mp, type:map, comment:null), ] @@ -428,10 +442,12 @@ POSTHOOK: Lineage: orc_create_complex.strct SIMPLE [(orc_create_staging)orc_crea PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/orc_create_people.txt' OVERWRITE INTO TABLE orc_create_people_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@orc_create_people_staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/orc_create_people.txt' OVERWRITE INTO TABLE orc_create_people_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@orc_create_people_staging POSTHOOK: Lineage: orc_create_complex.lst SIMPLE [(orc_create_staging)orc_create_staging.FieldSchema(name:lst, type:array, comment:null), ] POSTHOOK: Lineage: orc_create_complex.mp SIMPLE [(orc_create_staging)orc_create_staging.FieldSchema(name:mp, type:map, comment:null), ] @@ -445,6 +461,7 @@ PREHOOK: query: CREATE TABLE orc_create_people ( PARTITIONED BY (state string) STORED AS orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE orc_create_people ( id int, first_name string, @@ -453,6 +470,7 @@ POSTHOOK: query: CREATE TABLE orc_create_people ( PARTITIONED BY (state string) STORED AS orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_create_people POSTHOOK: Lineage: orc_create_complex.lst SIMPLE [(orc_create_staging)orc_create_staging.FieldSchema(name:lst, type:array, comment:null), ] POSTHOOK: Lineage: orc_create_complex.mp SIMPLE [(orc_create_staging)orc_create_staging.FieldSchema(name:mp, type:map, comment:null), ] diff --git a/ql/src/test/results/clientpositive/orc_createas1.q.out b/ql/src/test/results/clientpositive/orc_createas1.q.out index af392c3..6577bf0 100644 --- a/ql/src/test/results/clientpositive/orc_createas1.q.out +++ b/ql/src/test/results/clientpositive/orc_createas1.q.out @@ -13,9 +13,11 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE orc_createas1a (key INT, value STRING) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE orc_createas1a (key INT, value STRING) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_createas1a PREHOOK: query: INSERT OVERWRITE TABLE orc_createas1a PARTITION (ds='1') SELECT * FROM src diff --git a/ql/src/test/results/clientpositive/orc_dictionary_threshold.q.out b/ql/src/test/results/clientpositive/orc_dictionary_threshold.q.out index b8187ef..f881482 100644 --- a/ql/src/test/results/clientpositive/orc_dictionary_threshold.q.out +++ b/ql/src/test/results/clientpositive/orc_dictionary_threshold.q.out @@ -7,6 +7,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Set the threshold to -1 to guarantee dictionary encoding is turned off -- Tests that the data can be read back correctly when a string column is stored -- without dictionary encoding @@ -16,6 +17,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_orc PREHOOK: query: -- should be single split INSERT OVERWRITE TABLE test_orc SELECT key FROM src TABLESAMPLE (10 ROWS) @@ -62,17 +64,21 @@ POSTHOOK: Output: default@test_orc POSTHOOK: Lineage: test_orc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: CREATE TABLE src_thousand(key STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_thousand(key STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_thousand POSTHOOK: Lineage: test_orc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1kv2.cogroup.txt' INTO TABLE src_thousand PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_thousand POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1kv2.cogroup.txt' INTO TABLE src_thousand POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_thousand POSTHOOK: Lineage: test_orc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: -- Add data to the table in such a way that alternate stripes encode the column diff --git a/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out b/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out index 9893a14..6ecb912 100644 --- a/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out +++ b/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out @@ -4,12 +4,14 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_orc (key STRING) PARTITIONED BY (part STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_orc PREHOOK: query: -- Create a table with one column write to a partition, then add an additional column and write -- to another partition diff --git a/ql/src/test/results/clientpositive/orc_empty_files.q.out b/ql/src/test/results/clientpositive/orc_empty_files.q.out index 0889a52..3070a85 100644 --- a/ql/src/test/results/clientpositive/orc_empty_files.q.out +++ b/ql/src/test/results/clientpositive/orc_empty_files.q.out @@ -4,12 +4,14 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_orc (key STRING, cnt INT) CLUSTERED BY (key) INTO 3 BUCKETS ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_orc PREHOOK: query: -- Creates a table bucketed into 3 buckets, but only one contains data, specifically bucket 1, -- buckets 0 and 2 are empty, so this tests reading from and empty file followed by a file diff --git a/ql/src/test/results/clientpositive/orc_empty_strings.q.out b/ql/src/test/results/clientpositive/orc_empty_strings.q.out index 7975ca9..ac8259b 100644 --- a/ql/src/test/results/clientpositive/orc_empty_strings.q.out +++ b/ql/src/test/results/clientpositive/orc_empty_strings.q.out @@ -3,11 +3,13 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_orc (key STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_orc PREHOOK: query: INSERT OVERWRITE TABLE test_orc SELECT '' FROM src tablesample (10 rows) PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/orc_ends_with_nulls.q.out b/ql/src/test/results/clientpositive/orc_ends_with_nulls.q.out index 81d6138..a6ef2c0 100644 --- a/ql/src/test/results/clientpositive/orc_ends_with_nulls.q.out +++ b/ql/src/test/results/clientpositive/orc_ends_with_nulls.q.out @@ -3,11 +3,13 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_orc (key STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_orc PREHOOK: query: ALTER TABLE test_orc SET SERDEPROPERTIES ('orc.row.index.stride' = '1000') PREHOOK: type: ALTERTABLE_SERDEPROPERTIES @@ -23,18 +25,22 @@ PREHOOK: query: -- nulls.txt is a file containing a non-null string row followed CREATE TABLE src_null(a STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- nulls.txt is a file containing a non-null string row followed by 1000 null string rows -- this produces the effect that the number of non-null rows between the last and second -- to last index stride are the same (there's only two index strides) CREATE TABLE src_null(a STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_null PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nulls.txt' INTO TABLE src_null PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_null POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nulls.txt' INTO TABLE src_null POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_null PREHOOK: query: INSERT OVERWRITE TABLE test_orc SELECT a FROM src_null PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out b/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out index ef47c5e..81257ad 100644 --- a/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out +++ b/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out @@ -11,6 +11,7 @@ PREHOOK: query: CREATE TABLE orc_pred(t tinyint, bin binary) STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE orc_pred(t tinyint, si smallint, i int, @@ -24,6 +25,7 @@ POSTHOOK: query: CREATE TABLE orc_pred(t tinyint, bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_pred PREHOOK: query: ALTER TABLE orc_pred SET SERDEPROPERTIES ('orc.row.index.stride' = '1000') PREHOOK: type: ALTERTABLE_SERDEPROPERTIES @@ -47,6 +49,7 @@ PREHOOK: query: CREATE TABLE staging(t tinyint, ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE staging(t tinyint, si smallint, i int, @@ -61,12 +64,15 @@ POSTHOOK: query: CREATE TABLE staging(t tinyint, ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@staging PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE INTO TABLE staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE INTO TABLE staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@staging PREHOOK: query: INSERT INTO TABLE orc_pred select * from staging PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/orc_split_elimination.q.out b/ql/src/test/results/clientpositive/orc_split_elimination.q.out index fcbcdb3..0075c00 100644 --- a/ql/src/test/results/clientpositive/orc_split_elimination.q.out +++ b/ql/src/test/results/clientpositive/orc_split_elimination.q.out @@ -1,13 +1,17 @@ PREHOOK: query: create table orc_split_elim (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table orc_split_elim (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_split_elim PREHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' into table orc_split_elim PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@orc_split_elim POSTHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' into table orc_split_elim POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@orc_split_elim PREHOOK: query: -- The above table will have 5 splits with the followings stats -- Stripe 1: @@ -258,35 +262,41 @@ POSTHOOK: Input: default@orc_split_elim PREHOOK: query: -- partitioned table create table orc_split_elim_part (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) partitioned by (country string, year int) stored as orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- partitioned table create table orc_split_elim_part (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) partitioned by (country string, year int) stored as orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_split_elim_part PREHOOK: query: alter table orc_split_elim_part add partition(country='us', year=2000) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@orc_split_elim_part +PREHOOK: Output: default@orc_split_elim_part POSTHOOK: query: alter table orc_split_elim_part add partition(country='us', year=2000) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@orc_split_elim_part +POSTHOOK: Output: default@orc_split_elim_part POSTHOOK: Output: default@orc_split_elim_part@country=us/year=2000 PREHOOK: query: alter table orc_split_elim_part add partition(country='us', year=2001) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@orc_split_elim_part +PREHOOK: Output: default@orc_split_elim_part POSTHOOK: query: alter table orc_split_elim_part add partition(country='us', year=2001) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@orc_split_elim_part +POSTHOOK: Output: default@orc_split_elim_part POSTHOOK: Output: default@orc_split_elim_part@country=us/year=2001 PREHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' into table orc_split_elim_part partition(country='us', year=2000) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@orc_split_elim_part@country=us/year=2000 POSTHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' into table orc_split_elim_part partition(country='us', year=2000) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@orc_split_elim_part@country=us/year=2000 PREHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' into table orc_split_elim_part partition(country='us', year=2001) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@orc_split_elim_part@country=us/year=2001 POSTHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' into table orc_split_elim_part partition(country='us', year=2001) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@orc_split_elim_part@country=us/year=2001 PREHOOK: query: -- 10 mapper - no split elimination select userid,string1,subtype,decimal1,ts from orc_split_elim_part where userid<=2 and country='us'order by userid diff --git a/ql/src/test/results/clientpositive/orc_vectorization_ppd.q.out b/ql/src/test/results/clientpositive/orc_vectorization_ppd.q.out index 91aae57..27d5c29 100644 --- a/ql/src/test/results/clientpositive/orc_vectorization_ppd.q.out +++ b/ql/src/test/results/clientpositive/orc_vectorization_ppd.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- create table with 1000 rows create table srcorc(key string, value string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- create table with 1000 rows create table srcorc(key string, value string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcorc PREHOOK: query: insert overwrite table srcorc select * from src PREHOOK: type: QUERY @@ -35,6 +37,7 @@ d double, s3 string) stored as ORC tblproperties("orc.row.index.stride"="1000", "orc.stripe.size"="100000", "orc.compress.size"="10000") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- load table with each row group having 1000 rows and stripe 1 & 2 having 5000 & 2000 rows respectively create table if not exists vectororc (s1 string, @@ -43,6 +46,7 @@ d double, s3 string) stored as ORC tblproperties("orc.row.index.stride"="1000", "orc.stripe.size"="100000", "orc.compress.size"="10000") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@vectororc POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -254,6 +258,7 @@ d double, s3 string) stored as ORC tblproperties("orc.row.index.stride"="1000", "orc.stripe.size"="100000", "orc.compress.size"="10000") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- since vectororc table has multiple orc file we will load them into a single file using another table create table if not exists testorc (s1 string, @@ -262,6 +267,7 @@ d double, s3 string) stored as ORC tblproperties("orc.row.index.stride"="1000", "orc.stripe.size"="100000", "orc.compress.size"="10000") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@testorc POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/parallel.q.out b/ql/src/test/results/clientpositive/parallel.q.out index d97d1d1..543fb2b 100644 --- a/ql/src/test/results/clientpositive/parallel.q.out +++ b/ql/src/test/results/clientpositive/parallel.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table if not exists src_a like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists src_a like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_a PREHOOK: query: create table if not exists src_b like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists src_b like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_b PREHOOK: query: explain from (select key, value from src group by key, value) s diff --git a/ql/src/test/results/clientpositive/parallel_orderby.q.out b/ql/src/test/results/clientpositive/parallel_orderby.q.out index e1a7e53..545f956 100644 --- a/ql/src/test/results/clientpositive/parallel_orderby.q.out +++ b/ql/src/test/results/clientpositive/parallel_orderby.q.out @@ -1,19 +1,25 @@ PREHOOK: query: create table src5 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src5 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src5 PREHOOK: query: load data local inpath '../../data/files/kv5.txt' into table src5 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src5 POSTHOOK: query: load data local inpath '../../data/files/kv5.txt' into table src5 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src5 PREHOOK: query: load data local inpath '../../data/files/kv5.txt' into table src5 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src5 POSTHOOK: query: load data local inpath '../../data/files/kv5.txt' into table src5 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src5 PREHOOK: query: explain create table total_ordered as select * from src5 order by key, value diff --git a/ql/src/test/results/clientpositive/parquet_create.q.out b/ql/src/test/results/clientpositive/parquet_create.q.out index 34fdea2..d2b98e9 100644 --- a/ql/src/test/results/clientpositive/parquet_create.q.out +++ b/ql/src/test/results/clientpositive/parquet_create.q.out @@ -17,6 +17,7 @@ FIELDS TERMINATED BY '|' COLLECTION ITEMS TERMINATED BY ',' MAP KEYS TERMINATED BY ':' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE parquet_create_staging ( id int, str string, @@ -28,6 +29,7 @@ FIELDS TERMINATED BY '|' COLLECTION ITEMS TERMINATED BY ',' MAP KEYS TERMINATED BY ':' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@parquet_create_staging PREHOOK: query: CREATE TABLE parquet_create ( id int, @@ -37,6 +39,7 @@ PREHOOK: query: CREATE TABLE parquet_create ( strct STRUCT ) STORED AS PARQUET PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE parquet_create ( id int, str string, @@ -45,6 +48,7 @@ POSTHOOK: query: CREATE TABLE parquet_create ( strct STRUCT ) STORED AS PARQUET POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@parquet_create PREHOOK: query: DESCRIBE FORMATTED parquet_create PREHOOK: type: DESCTABLE @@ -80,9 +84,11 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/parquet_create.txt' OVERWRITE INTO TABLE parquet_create_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@parquet_create_staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/parquet_create.txt' OVERWRITE INTO TABLE parquet_create_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@parquet_create_staging PREHOOK: query: SELECT * FROM parquet_create_staging PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/parquet_partitioned.q.out b/ql/src/test/results/clientpositive/parquet_partitioned.q.out index ecba6ce..9a798a6 100644 --- a/ql/src/test/results/clientpositive/parquet_partitioned.q.out +++ b/ql/src/test/results/clientpositive/parquet_partitioned.q.out @@ -13,6 +13,7 @@ PREHOOK: query: CREATE TABLE parquet_partitioned_staging ( ) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE parquet_partitioned_staging ( id int, str string, @@ -20,6 +21,7 @@ POSTHOOK: query: CREATE TABLE parquet_partitioned_staging ( ) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@parquet_partitioned_staging PREHOOK: query: CREATE TABLE parquet_partitioned ( id int, @@ -27,12 +29,14 @@ PREHOOK: query: CREATE TABLE parquet_partitioned ( ) PARTITIONED BY (part string) STORED AS PARQUET PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE parquet_partitioned ( id int, str string ) PARTITIONED BY (part string) STORED AS PARQUET POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@parquet_partitioned PREHOOK: query: DESCRIBE FORMATTED parquet_partitioned PREHOOK: type: DESCTABLE @@ -70,9 +74,11 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/parquet_partitioned.txt' OVERWRITE INTO TABLE parquet_partitioned_staging PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@parquet_partitioned_staging POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/parquet_partitioned.txt' OVERWRITE INTO TABLE parquet_partitioned_staging POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@parquet_partitioned_staging PREHOOK: query: SELECT * FROM parquet_partitioned_staging PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partInit.q.out b/ql/src/test/results/clientpositive/partInit.q.out index c451bc4..3ec9504 100644 --- a/ql/src/test/results/clientpositive/partInit.q.out +++ b/ql/src/test/results/clientpositive/partInit.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE empty (c INT) PARTITIONED BY (p INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE empty (c INT) PARTITIONED BY (p INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@empty PREHOOK: query: SELECT MAX(c) FROM empty PREHOOK: type: QUERY @@ -23,10 +25,10 @@ POSTHOOK: Input: default@empty NULL PREHOOK: query: ALTER TABLE empty ADD PARTITION (p=1) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@empty +PREHOOK: Output: default@empty POSTHOOK: query: ALTER TABLE empty ADD PARTITION (p=1) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@empty +POSTHOOK: Output: default@empty POSTHOOK: Output: default@empty@p=1 PREHOOK: query: SELECT MAX(p) FROM empty PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out b/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out index ed26384..5ebef1a 100644 --- a/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out +++ b/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out @@ -2,17 +2,19 @@ PREHOOK: query: -- The property needs to be unset at the end of the test till HI create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- The property needs to be unset at the end of the test till HIVE-3109/HIVE-3112 is fixed create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mytbl PREHOOK: query: alter table mytbl add partition (c2 = 'v1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mytbl +PREHOOK: Output: default@mytbl POSTHOOK: query: alter table mytbl add partition (c2 = 'v1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mytbl +POSTHOOK: Output: default@mytbl POSTHOOK: Output: default@mytbl@c2=v1 PREHOOK: query: describe formatted mytbl partition (c2='v1') PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out b/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out index d767558..d533c8d 100644 --- a/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out +++ b/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out @@ -1,14 +1,16 @@ PREHOOK: query: create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mytbl PREHOOK: query: alter table mytbl add partition (c2 = 'v1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mytbl +PREHOOK: Output: default@mytbl POSTHOOK: query: alter table mytbl add partition (c2 = 'v1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mytbl +POSTHOOK: Output: default@mytbl POSTHOOK: Output: default@mytbl@c2=v1 PREHOOK: query: describe formatted mytbl partition (c2='v1') PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out b/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out index ec0b3c2..6892af0 100644 --- a/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out +++ b/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out @@ -2,17 +2,19 @@ PREHOOK: query: -- The property needs to be unset at the end of the test till HI create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- The property needs to be unset at the end of the test till HIVE-3109/HIVE-3112 is fixed create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mytbl PREHOOK: query: alter table mytbl add partition (c2 = 'v1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@mytbl +PREHOOK: Output: default@mytbl POSTHOOK: query: alter table mytbl add partition (c2 = 'v1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@mytbl +POSTHOOK: Output: default@mytbl POSTHOOK: Output: default@mytbl@c2=v1 PREHOOK: query: describe formatted mytbl partition (c2='v1') PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/partcols1.q.out b/ql/src/test/results/clientpositive/partcols1.q.out index 937ab3e..21863f7 100644 --- a/ql/src/test/results/clientpositive/partcols1.q.out +++ b/ql/src/test/results/clientpositive/partcols1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table test1(col1 string) partitioned by (partitionId int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test1(col1 string) partitioned by (partitionId int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test1 PREHOOK: query: insert overwrite table test1 partition (partitionId=1) select key from src tablesample (10 rows) diff --git a/ql/src/test/results/clientpositive/partition_date.q.out b/ql/src/test/results/clientpositive/partition_date.q.out index b73d292..c0b4fed 100644 --- a/ql/src/test/results/clientpositive/partition_date.q.out +++ b/ql/src/test/results/clientpositive/partition_date.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table partition_date_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table partition_date_1 (key string, value string) partitioned by (dt date, region string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_date_1 (key string, value string) partitioned by (dt date, region string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_date_1 PREHOOK: query: insert overwrite table partition_date_1 partition(dt='2000-01-01', region= '1') select * from src tablesample (10 rows) diff --git a/ql/src/test/results/clientpositive/partition_date2.q.out b/ql/src/test/results/clientpositive/partition_date2.q.out index 3845de4..e0f55f4 100644 --- a/ql/src/test/results/clientpositive/partition_date2.q.out +++ b/ql/src/test/results/clientpositive/partition_date2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table partition_date2_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table partition_date2_1 (key string, value string) partitioned by (dt date, region int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_date2_1 (key string, value string) partitioned by (dt date, region int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_date2_1 PREHOOK: query: -- test date literal syntax from (select * from src tablesample (1 rows)) x @@ -191,11 +193,11 @@ POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=2000-01-01,region=2).value SIM PREHOOK: query: -- alter table add partition alter table partition_date2_1 add partition (dt=date '1980-01-02', region=3) PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@partition_date2_1 +PREHOOK: Output: default@partition_date2_1 POSTHOOK: query: -- alter table add partition alter table partition_date2_1 add partition (dt=date '1980-01-02', region=3) POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@partition_date2_1 +POSTHOOK: Output: default@partition_date2_1 POSTHOOK: Output: default@partition_date2_1@dt=1980-01-02/region=3 POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=1999-01-01,region=2).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=1999-01-01,region=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -442,6 +444,7 @@ alter table partition_date2_1 partition(dt=date '1980-01-02', region=3) PREHOOK: type: ALTERPARTITION_LOCATION PREHOOK: Input: default@partition_date2_1 PREHOOK: Output: default@partition_date2_1@dt=1980-01-02/region=3 +#### A masked pattern was here #### POSTHOOK: query: -- alter table set location alter table partition_date2_1 partition(dt=date '1980-01-02', region=3) #### A masked pattern was here #### @@ -449,6 +452,7 @@ POSTHOOK: type: ALTERPARTITION_LOCATION POSTHOOK: Input: default@partition_date2_1 POSTHOOK: Input: default@partition_date2_1@dt=1980-01-02/region=3 POSTHOOK: Output: default@partition_date2_1@dt=1980-01-02/region=3 +#### A masked pattern was here #### POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=1980-01-02,region=3).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=1980-01-02,region=3).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=1999-01-01,region=2).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/partition_decode_name.q.out b/ql/src/test/results/clientpositive/partition_decode_name.q.out index 910e3ac..9231bcb 100644 --- a/ql/src/test/results/clientpositive/partition_decode_name.q.out +++ b/ql/src/test/results/clientpositive/partition_decode_name.q.out @@ -17,8 +17,10 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@sc PREHOOK: query: create table sc_part (key string) partitioned by (ts string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table sc_part (key string) partitioned by (ts string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@sc_part PREHOOK: query: insert overwrite table sc_part partition(ts) select * from sc PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_schema1.q.out b/ql/src/test/results/clientpositive/partition_schema1.q.out index 6d9b7ca..aabedb8 100644 --- a/ql/src/test/results/clientpositive/partition_schema1.q.out +++ b/ql/src/test/results/clientpositive/partition_schema1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partition_schema1(key string, value string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_schema1(key string, value string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_schema1 PREHOOK: query: insert overwrite table partition_schema1 partition(dt='100') select * from src1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_serde_format.q.out b/ql/src/test/results/clientpositive/partition_serde_format.q.out index 92f6518..e5903b1 100644 --- a/ql/src/test/results/clientpositive/partition_serde_format.q.out +++ b/ql/src/test/results/clientpositive/partition_serde_format.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table src_part_serde (key int, value string) partitioned by (ds string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_part_serde (key int, value string) partitioned by (ds string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_part_serde PREHOOK: query: insert overwrite table src_part_serde partition (ds='2011') select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_special_char.q.out b/ql/src/test/results/clientpositive/partition_special_char.q.out index 8a8ee1b..e3c3cc4 100644 --- a/ql/src/test/results/clientpositive/partition_special_char.q.out +++ b/ql/src/test/results/clientpositive/partition_special_char.q.out @@ -17,8 +17,10 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@sc PREHOOK: query: create table sc_part (key string) partitioned by (ts string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table sc_part (key string) partitioned by (ts string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@sc_part PREHOOK: query: insert overwrite table sc_part partition(ts) select * from sc PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_type_check.q.out b/ql/src/test/results/clientpositive/partition_type_check.q.out index b166587..c61f4fc 100644 --- a/ql/src/test/results/clientpositive/partition_type_check.q.out +++ b/ql/src/test/results/clientpositive/partition_type_check.q.out @@ -1,15 +1,19 @@ PREHOOK: query: -- begin part(string, string) pass(string, int) CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- begin part(string, string) pass(string, int) CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day=2) PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tab1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day=2) POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tab1 POSTHOOK: Output: default@tab1@month=June/day=2 PREHOOK: query: select * from tab1 @@ -39,15 +43,19 @@ POSTHOOK: Output: default@tab1 PREHOOK: query: -- begin part(string, int) pass(string, string) CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day int) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- begin part(string, int) pass(string, string) CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day int) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tab1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tab1 POSTHOOK: Output: default@tab1@month=June/day=2 PREHOOK: query: select * from tab1 @@ -77,22 +85,26 @@ POSTHOOK: Output: default@tab1 PREHOOK: query: -- begin part(string, date) pass(string, date) create table tab1 (id1 int, id2 string) PARTITIONED BY(month string,day date) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- begin part(string, date) pass(string, date) create table tab1 (id1 int, id2 string) PARTITIONED BY(month string,day date) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tab1 PREHOOK: query: alter table tab1 add partition (month='June', day='2008-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tab1 +PREHOOK: Output: default@tab1 POSTHOOK: query: alter table tab1 add partition (month='June', day='2008-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tab1 +POSTHOOK: Output: default@tab1 POSTHOOK: Output: default@tab1@month=June/day=2008-01-01 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='2008-01-01') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tab1@month=June/day=2008-01-01 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='2008-01-01') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tab1@month=June/day=2008-01-01 PREHOOK: query: select id1, id2, day from tab1 where day='2008-01-01' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_varchar1.q.out b/ql/src/test/results/clientpositive/partition_varchar1.q.out index fea6561..b932c98 100644 --- a/ql/src/test/results/clientpositive/partition_varchar1.q.out +++ b/ql/src/test/results/clientpositive/partition_varchar1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table partition_varchar_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table partition_varchar_1 (key string, value varchar(20)) partitioned by (dt varchar(10), region int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_varchar_1 (key string, value varchar(20)) partitioned by (dt varchar(10), region int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_varchar_1 PREHOOK: query: insert overwrite table partition_varchar_1 partition(dt='2000-01-01', region=1) select * from src tablesample (10 rows) diff --git a/ql/src/test/results/clientpositive/partition_varchar2.q.out b/ql/src/test/results/clientpositive/partition_varchar2.q.out index 0625cf0..62ed979 100644 --- a/ql/src/test/results/clientpositive/partition_varchar2.q.out +++ b/ql/src/test/results/clientpositive/partition_varchar2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table partition_varchar_2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table partition_varchar_2 (key string, value varchar(20)) partitioned by (dt varchar(15), region int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_varchar_2 (key string, value varchar(20)) partitioned by (dt varchar(15), region int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_varchar_2 PREHOOK: query: insert overwrite table partition_varchar_2 partition(dt='2000-01-01', region=1) select * from src order by key limit 1 diff --git a/ql/src/test/results/clientpositive/partition_vs_table_metadata.q.out b/ql/src/test/results/clientpositive/partition_vs_table_metadata.q.out index cd5e8e6..66ccaef 100644 --- a/ql/src/test/results/clientpositive/partition_vs_table_metadata.q.out +++ b/ql/src/test/results/clientpositive/partition_vs_table_metadata.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partition_vs_table(key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_vs_table(key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_vs_table PREHOOK: query: insert overwrite table partition_vs_table partition(ds='100') select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat.q.out index 0146e2e..ac3543e 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt=100) select * from src1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out index 390338c..0e2c43e 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- This tests that the schema can be changed for binary serde data create table prt(key string, value string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests that the schema can be changed for binary serde data create table prt(key string, value string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@prt PREHOOK: query: insert overwrite table prt partition(dt='1') select * from src where key = 238 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out index a0325c8..7f00b0b 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- This tests that the schema can be changed for binary serde data create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests that the schema can be changed for binary serde data create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: alter table partition_test_partitioned set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out index 256bf1b..c4dcac3 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- This tests that the schema can be changed for binary serde data create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests that the schema can be changed for binary serde data create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: alter table partition_test_partitioned set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out index 6a85d74..f5058a7 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- This tests that the schema can be changed for partitioned tables for binary serde data for joins create table T1(key string, value string) partitioned by (dt string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests that the schema can be changed for partitioned tables for binary serde data for joins create table T1(key string, value string) partitioned by (dt string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: alter table T1 set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER @@ -59,8 +61,10 @@ POSTHOOK: Lineage: t1 PARTITION(dt=2).key EXPRESSION [(src)src.FieldSchema(name: POSTHOOK: Lineage: t1 PARTITION(dt=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table T2(key string, value string) partitioned by (dt string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table T2(key string, value string) partitioned by (dt string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 POSTHOOK: Lineage: t1 PARTITION(dt=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: t1 PARTITION(dt=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out index 1c52b08..6388666 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out @@ -1,16 +1,20 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) PARTITIONED by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) PARTITIONED by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) PARTITIONED by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) PARTITIONED by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: alter table tbl1 set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out index 0b3f282..a6cb59f 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- This tests that the schema can be changed for binary serde da create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests that the schema can be changed for binary serde data create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt='1') select * from src where key = 238 diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out index c4cebcb..e80fc9d 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- This tests that the schema can be changed for binary serde da create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests that the schema can be changed for binary serde data create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt='1') select * from src where key = 238 diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat17.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat17.q.out index 1b13a0e..11590bf 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat17.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat17.q.out @@ -12,14 +12,18 @@ DROP TABLE PW17 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE PW17(USER STRING, COMPLEXDT ARRAY) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE PW17(USER STRING, COMPLEXDT ARRAY) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@PW17 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17 PARTITION (YEAR='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@pw17 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17 PARTITION (YEAR='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@pw17 POSTHOOK: Output: default@pw17@year=1 PREHOOK: query: ALTER TABLE PW17 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe2' @@ -63,14 +67,18 @@ DROP TABLE PW17_2 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE PW17_2(USER STRING, COMPLEXDT ARRAY) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE PW17_2(USER STRING, COMPLEXDT ARRAY) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@PW17_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@pw17_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@pw17_2 PREHOOK: query: -- Without the fix HIVE-5199, will throw cast exception via MapOperator SELECT COUNT(*) FROM PW17_2 @@ -89,14 +97,18 @@ POSTHOOK: query: DROP TABLE PW17_3 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE PW17_3(USER STRING, COMPLEXDT ARRAY >) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE PW17_3(USER STRING, COMPLEXDT ARRAY >) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@PW17_3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_3 PARTITION (YEAR='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@pw17_3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_3 PARTITION (YEAR='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@pw17_3 POSTHOOK: Output: default@pw17_3@year=1 PREHOOK: query: ALTER TABLE PW17_3 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe2' @@ -138,14 +150,18 @@ POSTHOOK: query: DROP TABLE PW17_4 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE PW17_4(USER STRING, COMPLEXDT ARRAY >) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE PW17_4(USER STRING, COMPLEXDT ARRAY >) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@PW17_4 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@pw17_4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@pw17_4 PREHOOK: query: -- Without the fix HIVE-5285, will throw cast exception via MapOperator SELECT COUNT(*) FROM PW17_4 diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat18.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat18.q.out index fce16a0..d9b5ba5 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat18.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat18.q.out @@ -14,14 +14,18 @@ DROP TABLE PW18 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE PW18(USER STRING, COMPLEXDT UNIONTYPE) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe5' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE PW18(USER STRING, COMPLEXDT UNIONTYPE) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe5' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@PW18 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW18 PARTITION (YEAR='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@pw18 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW18 PARTITION (YEAR='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@pw18 POSTHOOK: Output: default@pw18@year=1 PREHOOK: query: ALTER TABLE PW18 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe4' @@ -57,14 +61,18 @@ DROP TABLE PW18_2 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE PW18_2(USER STRING, COMPLEXDT UNIONTYPE) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe5' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE PW18_2(USER STRING, COMPLEXDT UNIONTYPE) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe5' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@PW18_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW18_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@pw18_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW18_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@pw18_2 PREHOOK: query: -- Without the fix HIVE-5202, will throw unsupported data type exception SELECT COUNT(*) FROM PW18_2 diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat2.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat2.q.out index edf1a1f..8f22ae2 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat2.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt=100) select * from src1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat3.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat3.q.out index 5a32a20..b25faec 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat3.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: alter table partition_test_partitioned set fileformat rcfile PREHOOK: type: ALTERTABLE_FILEFORMAT diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat4.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat4.q.out index 9a2beb2..550aaf2 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat4.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: alter table partition_test_partitioned set fileformat sequencefile PREHOOK: type: ALTERTABLE_FILEFORMAT @@ -34,10 +36,10 @@ POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=1).key SIMPLE [(src1) POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=1).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: alter table partition_test_partitioned add partition (dt='2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@partition_test_partitioned +PREHOOK: Output: default@partition_test_partitioned POSTHOOK: query: alter table partition_test_partitioned add partition (dt='2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@partition_test_partitioned +POSTHOOK: Output: default@partition_test_partitioned POSTHOOK: Output: default@partition_test_partitioned@dt=2 POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=1).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_test_partitioned PARTITION(dt=1).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat5.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat5.q.out index 36b5fca..d079368 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat5.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: alter table partition_test_partitioned set fileformat rcfile PREHOOK: type: ALTERTABLE_FILEFORMAT diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat6.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat6.q.out index fda54d7..bb25b78 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat6.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat6.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: alter table partition_test_partitioned set fileformat rcfile PREHOOK: type: ALTERTABLE_FILEFORMAT diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat7.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat7.q.out index 8164d1b..f131b5e 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat7.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat7.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: alter table partition_test_partitioned set fileformat rcfile PREHOOK: type: ALTERTABLE_FILEFORMAT diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out index 94856c4..4b47ad9 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- This tests that a query can span multiple partitions which ca -- also different serdes create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests that a query can span multiple partitions which can not only have different file formats, but -- also different serdes create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt='1') select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out b/ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out index 7dd8781..a4aa127 100644 --- a/ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out +++ b/ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- This tests that a query can span multiple partitions which ca -- also different serdes create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests that a query can span multiple partitions which can not only have different file formats, but -- also different serdes create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@partition_test_partitioned PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt='1') select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/partitions_json.q.out b/ql/src/test/results/clientpositive/partitions_json.q.out index 9bf9dcc..944db94 100644 --- a/ql/src/test/results/clientpositive/partitions_json.q.out +++ b/ql/src/test/results/clientpositive/partitions_json.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@add_part_test PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS @@ -10,10 +12,10 @@ POSTHOOK: type: SHOWPARTITIONS {"partitions":[]} PREHOOK: query: ALTER TABLE add_part_test ADD PARTITION (ds='2010-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@add_part_test +PREHOOK: Output: default@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD PARTITION (ds='2010-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@add_part_test +POSTHOOK: Output: default@add_part_test POSTHOOK: Output: default@add_part_test@ds=2010-01-01 PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS @@ -22,10 +24,10 @@ POSTHOOK: type: SHOWPARTITIONS {"partitions":[{"values":[{"columnName":"ds","columnValue":"2010-01-01"}],"name":"ds='2010-01-01'"}]} PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@add_part_test +PREHOOK: Output: default@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@add_part_test +POSTHOOK: Output: default@add_part_test PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS POSTHOOK: query: SHOW PARTITIONS add_part_test @@ -33,10 +35,10 @@ POSTHOOK: type: SHOWPARTITIONS {"partitions":[{"values":[{"columnName":"ds","columnValue":"2010-01-01"}],"name":"ds='2010-01-01'"}]} PREHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@add_part_test +PREHOOK: Output: default@add_part_test POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-02') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@add_part_test +POSTHOOK: Output: default@add_part_test POSTHOOK: Output: default@add_part_test@ds=2010-01-02 PREHOOK: query: SHOW PARTITIONS add_part_test PREHOOK: type: SHOWPARTITIONS diff --git a/ql/src/test/results/clientpositive/pcr.q.out b/ql/src/test/results/clientpositive/pcr.q.out index 7f216d9..d030499 100644 --- a/ql/src/test/results/clientpositive/pcr.q.out +++ b/ql/src/test/results/clientpositive/pcr.q.out @@ -12,8 +12,10 @@ POSTHOOK: query: drop table pcr_t3 POSTHOOK: type: DROPTABLE PREHOOK: query: create table pcr_t1 (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table pcr_t1 (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pcr_t1 PREHOOK: query: insert overwrite table pcr_t1 partition (ds='2000-04-08') select * from src where key < 20 order by key PREHOOK: type: QUERY @@ -3931,8 +3933,10 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-11).value SIMPLE [(src)src.FieldS 19 val_19 2000-04-10 PREHOOK: query: create table pcr_t2 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table pcr_t2 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pcr_t2 POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-08).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-08).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -3944,8 +3948,10 @@ POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-11).key EXPRESSION [(src)src.Fiel POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-11).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table pcr_t3 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table pcr_t3 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pcr_t3 POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-08).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-08).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -5959,8 +5965,10 @@ POSTHOOK: Lineage: pcr_t3.value SIMPLE [(pcr_t1)pcr_t1.FieldSchema(name:value, t POSTHOOK: Lineage: pcr_t3.value SIMPLE [(pcr_t1)pcr_t1.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: create table pcr_foo (key int, value string) partitioned by (ds int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table pcr_foo (key int, value string) partitioned by (ds int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pcr_foo POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-08).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: pcr_t1 PARTITION(ds=2000-04-08).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -6223,6 +6231,7 @@ row format delimited fields terminated by '\t' collection items terminated by '\001' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Cover org.apache.hadoop.hive.ql.optimizer.pcr.PcrExprProcFactory.FieldExprProcessor. -- Create a table with a struct data: create table ab(strct struct) @@ -6230,6 +6239,7 @@ row format delimited fields terminated by '\t' collection items terminated by '\001' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ab POSTHOOK: Lineage: pcr_foo PARTITION(ds=3).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: pcr_foo PARTITION(ds=3).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -6256,10 +6266,12 @@ POSTHOOK: Lineage: pcr_t3.value SIMPLE [(pcr_t1)pcr_t1.FieldSchema(name:value, t PREHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table ab PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@ab POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite into table ab POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@ab POSTHOOK: Lineage: pcr_foo PARTITION(ds=3).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: pcr_foo PARTITION(ds=3).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -6313,8 +6325,10 @@ POSTHOOK: Lineage: pcr_t3.value SIMPLE [(pcr_t1)pcr_t1.FieldSchema(name:value, t POSTHOOK: Lineage: pcr_t3.value SIMPLE [(pcr_t1)pcr_t1.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: create table foo_field (s struct) partitioned by (ds int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table foo_field (s struct) partitioned by (ds int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@foo_field POSTHOOK: Lineage: pcr_foo PARTITION(ds=3).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: pcr_foo PARTITION(ds=3).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/ppd_constant_expr.q.out b/ql/src/test/results/clientpositive/ppd_constant_expr.q.out index 5b0f3c2..7c6b9cd 100644 --- a/ql/src/test/results/clientpositive/ppd_constant_expr.q.out +++ b/ql/src/test/results/clientpositive/ppd_constant_expr.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE ppd_constant_expr(c1 STRING, c2 INT, c3 DOUBLE) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE ppd_constant_expr(c1 STRING, c2 INT, c3 DOUBLE) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ppd_constant_expr PREHOOK: query: EXPLAIN FROM src1 diff --git a/ql/src/test/results/clientpositive/ppd_multi_insert.q.out b/ql/src/test/results/clientpositive/ppd_multi_insert.q.out index 2e6f877..502c5a0 100644 --- a/ql/src/test/results/clientpositive/ppd_multi_insert.q.out +++ b/ql/src/test/results/clientpositive/ppd_multi_insert.q.out @@ -1,17 +1,23 @@ PREHOOK: query: CREATE TABLE mi1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE mi1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mi1 PREHOOK: query: CREATE TABLE mi2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE mi2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mi2 PREHOOK: query: CREATE TABLE mi3(key INT) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE mi3(key INT) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mi3 PREHOOK: query: EXPLAIN FROM src a JOIN src b ON (a.key = b.key) diff --git a/ql/src/test/results/clientpositive/ppd_outer_join5.q.out b/ql/src/test/results/clientpositive/ppd_outer_join5.q.out index cdad2af..07a78a1 100644 --- a/ql/src/test/results/clientpositive/ppd_outer_join5.q.out +++ b/ql/src/test/results/clientpositive/ppd_outer_join5.q.out @@ -1,22 +1,30 @@ PREHOOK: query: create table t1 (id int, key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t1 (id int, key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create table t2 (id int, key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t2 (id int, key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t2 PREHOOK: query: create table t3 (id int, key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t3 (id int, key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t3 PREHOOK: query: create table t4 (id int, key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t4 (id int, key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t4 PREHOOK: query: explain select * from t1 full outer join t2 on t1.id=t2.id join t3 on t2.id=t3.id where t3.id=20 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out b/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out index e96130e..d63dfd2 100644 --- a/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out +++ b/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: drop table pokes2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table pokes (foo int, bar int, blah int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table pokes (foo int, bar int, blah int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pokes PREHOOK: query: create table pokes2 (foo int, bar int, blah int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table pokes2 (foo int, bar int, blah int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@pokes2 PREHOOK: query: -- Q1: predicate should not be pushed on the right side of a left outer join explain diff --git a/ql/src/test/results/clientpositive/ppd_union_view.q.out b/ql/src/test/results/clientpositive/ppd_union_view.q.out index 41172fd..01aec77 100644 --- a/ql/src/test/results/clientpositive/ppd_union_view.q.out +++ b/ql/src/test/results/clientpositive/ppd_union_view.q.out @@ -8,8 +8,10 @@ drop view v POSTHOOK: type: DROPVIEW PREHOOK: query: create table t1_new (key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t1_new (key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1_new PREHOOK: query: insert overwrite table t1_new partition (ds = '2011-10-15') select 'key1', 'value1' from src tablesample (1 rows) @@ -39,8 +41,10 @@ POSTHOOK: Lineage: t1_new PARTITION(ds=2011-10-16).key SIMPLE [] POSTHOOK: Lineage: t1_new PARTITION(ds=2011-10-16).value SIMPLE [] PREHOOK: query: create table t1_old (keymap string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t1_old (keymap string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1_old POSTHOOK: Lineage: t1_new PARTITION(ds=2011-10-15).key SIMPLE [] POSTHOOK: Lineage: t1_new PARTITION(ds=2011-10-15).value SIMPLE [] @@ -82,8 +86,10 @@ POSTHOOK: Lineage: t1_old PARTITION(ds=2011-10-14).keymap SIMPLE [] POSTHOOK: Lineage: t1_old PARTITION(ds=2011-10-14).value SIMPLE [] PREHOOK: query: create table t1_mapping (key string, keymap string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t1_mapping (key string, keymap string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1_mapping POSTHOOK: Lineage: t1_new PARTITION(ds=2011-10-15).key SIMPLE [] POSTHOOK: Lineage: t1_new PARTITION(ds=2011-10-15).value SIMPLE [] diff --git a/ql/src/test/results/clientpositive/ppr_pushdown.q.out b/ql/src/test/results/clientpositive/ppr_pushdown.q.out index 57f2f30..27298a8 100644 --- a/ql/src/test/results/clientpositive/ppr_pushdown.q.out +++ b/ql/src/test/results/clientpositive/ppr_pushdown.q.out @@ -1,63 +1,65 @@ PREHOOK: query: create table ppr_test (key string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ppr_test (key string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ppr_test PREHOOK: query: alter table ppr_test add partition (ds = '1234') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ppr_test +PREHOOK: Output: default@ppr_test POSTHOOK: query: alter table ppr_test add partition (ds = '1234') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ppr_test +POSTHOOK: Output: default@ppr_test POSTHOOK: Output: default@ppr_test@ds=1234 PREHOOK: query: alter table ppr_test add partition (ds = '1224') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ppr_test +PREHOOK: Output: default@ppr_test POSTHOOK: query: alter table ppr_test add partition (ds = '1224') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ppr_test +POSTHOOK: Output: default@ppr_test POSTHOOK: Output: default@ppr_test@ds=1224 PREHOOK: query: alter table ppr_test add partition (ds = '1214') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ppr_test +PREHOOK: Output: default@ppr_test POSTHOOK: query: alter table ppr_test add partition (ds = '1214') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ppr_test +POSTHOOK: Output: default@ppr_test POSTHOOK: Output: default@ppr_test@ds=1214 PREHOOK: query: alter table ppr_test add partition (ds = '12+4') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ppr_test +PREHOOK: Output: default@ppr_test POSTHOOK: query: alter table ppr_test add partition (ds = '12+4') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ppr_test +POSTHOOK: Output: default@ppr_test POSTHOOK: Output: default@ppr_test@ds=12+4 PREHOOK: query: alter table ppr_test add partition (ds = '12.4') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ppr_test +PREHOOK: Output: default@ppr_test POSTHOOK: query: alter table ppr_test add partition (ds = '12.4') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ppr_test +POSTHOOK: Output: default@ppr_test POSTHOOK: Output: default@ppr_test@ds=12.4 PREHOOK: query: alter table ppr_test add partition (ds = '12:4') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ppr_test +PREHOOK: Output: default@ppr_test POSTHOOK: query: alter table ppr_test add partition (ds = '12:4') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ppr_test +POSTHOOK: Output: default@ppr_test POSTHOOK: Output: default@ppr_test@ds=12%3A4 PREHOOK: query: alter table ppr_test add partition (ds = '12%4') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ppr_test +PREHOOK: Output: default@ppr_test POSTHOOK: query: alter table ppr_test add partition (ds = '12%4') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ppr_test +POSTHOOK: Output: default@ppr_test POSTHOOK: Output: default@ppr_test@ds=12%254 PREHOOK: query: alter table ppr_test add partition (ds = '12*4') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@ppr_test +PREHOOK: Output: default@ppr_test POSTHOOK: query: alter table ppr_test add partition (ds = '12*4') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@ppr_test +POSTHOOK: Output: default@ppr_test POSTHOOK: Output: default@ppr_test@ds=12%2A4 PREHOOK: query: insert overwrite table ppr_test partition(ds = '1234') select * from (select '1234' from src tablesample (1 rows) union all select 'abcd' from src tablesample (1 rows)) s PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/ppr_pushdown2.q.out b/ql/src/test/results/clientpositive/ppr_pushdown2.q.out index ecd26d3..67a9a43 100644 --- a/ql/src/test/results/clientpositive/ppr_pushdown2.q.out +++ b/ql/src/test/results/clientpositive/ppr_pushdown2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table ppr_test (key string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ppr_test (key string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ppr_test PREHOOK: query: insert overwrite table ppr_test partition(ds='2') select '2' from src tablesample (1 rows) PREHOOK: type: QUERY @@ -50,8 +52,10 @@ POSTHOOK: Lineage: ppr_test PARTITION(ds=2).key SIMPLE [] 22 22 PREHOOK: query: create table ppr_test2 (key string) partitioned by (ds string, s string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ppr_test2 (key string) partitioned by (ds string, s string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ppr_test2 POSTHOOK: Lineage: ppr_test PARTITION(ds=22).key SIMPLE [] POSTHOOK: Lineage: ppr_test PARTITION(ds=2).key SIMPLE [] @@ -110,8 +114,10 @@ POSTHOOK: Lineage: ppr_test2 PARTITION(ds=2,s=1).key SIMPLE [] 1 1 2 PREHOOK: query: create table ppr_test3 (key string) partitioned by (col string, ol string, l string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table ppr_test3 (key string) partitioned by (col string, ol string, l string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@ppr_test3 POSTHOOK: Lineage: ppr_test PARTITION(ds=22).key SIMPLE [] POSTHOOK: Lineage: ppr_test PARTITION(ds=2).key SIMPLE [] diff --git a/ql/src/test/results/clientpositive/progress_1.q.out b/ql/src/test/results/clientpositive/progress_1.q.out index 05415b9..c22d9c4 100644 --- a/ql/src/test/results/clientpositive/progress_1.q.out +++ b/ql/src/test/results/clientpositive/progress_1.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE PROGRESS_1(key int, value string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE PROGRESS_1(key int, value string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@PROGRESS_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv6.txt' INTO TABLE PROGRESS_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@progress_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv6.txt' INTO TABLE PROGRESS_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@progress_1 PREHOOK: query: select count(1) from PROGRESS_1 t1 join PROGRESS_1 t2 on t1.key=t2.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/protectmode.q.out b/ql/src/test/results/clientpositive/protectmode.q.out index 1db2949..c31c6cf 100644 --- a/ql/src/test/results/clientpositive/protectmode.q.out +++ b/ql/src/test/results/clientpositive/protectmode.q.out @@ -12,8 +12,10 @@ POSTHOOK: query: drop table tbl2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl1 (col string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl1 (col string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: select * from tbl1 PREHOOK: type: QUERY @@ -79,29 +81,31 @@ POSTHOOK: Input: default@tbl1 #### A masked pattern was here #### PREHOOK: query: create table tbl2 (col string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl2 (col string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: alter table tbl2 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl2 +PREHOOK: Output: default@tbl2 POSTHOOK: query: alter table tbl2 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl2 +POSTHOOK: Output: default@tbl2 POSTHOOK: Output: default@tbl2@p=p1 PREHOOK: query: alter table tbl2 add partition (p='p2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl2 +PREHOOK: Output: default@tbl2 POSTHOOK: query: alter table tbl2 add partition (p='p2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl2 +POSTHOOK: Output: default@tbl2 POSTHOOK: Output: default@tbl2@p=p2 PREHOOK: query: alter table tbl2 add partition (p='p3') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl2 +PREHOOK: Output: default@tbl2 POSTHOOK: query: alter table tbl2 add partition (p='p3') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl2 +POSTHOOK: Output: default@tbl2 POSTHOOK: Output: default@tbl2@p=p3 PREHOOK: query: alter table tbl2 drop partition (p='not_exist') PREHOOK: type: ALTERTABLE_DROPPARTS diff --git a/ql/src/test/results/clientpositive/protectmode2.q.out b/ql/src/test/results/clientpositive/protectmode2.q.out index a0d2472..83bcb9b 100644 --- a/ql/src/test/results/clientpositive/protectmode2.q.out +++ b/ql/src/test/results/clientpositive/protectmode2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table tbl1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl1 (col string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl1 (col string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: alter table tbl1 enable no_drop cascade PREHOOK: type: ALTERTABLE_PROTECTMODE @@ -74,29 +76,31 @@ POSTHOOK: query: drop table tbl2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table tbl2 (col string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tbl2 (col string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: alter table tbl2 add partition (p='p1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl2 +PREHOOK: Output: default@tbl2 POSTHOOK: query: alter table tbl2 add partition (p='p1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl2 +POSTHOOK: Output: default@tbl2 POSTHOOK: Output: default@tbl2@p=p1 PREHOOK: query: alter table tbl2 add partition (p='p2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl2 +PREHOOK: Output: default@tbl2 POSTHOOK: query: alter table tbl2 add partition (p='p2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl2 +POSTHOOK: Output: default@tbl2 POSTHOOK: Output: default@tbl2@p=p2 PREHOOK: query: alter table tbl2 add partition (p='p3') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tbl2 +PREHOOK: Output: default@tbl2 POSTHOOK: query: alter table tbl2 add partition (p='p3') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tbl2 +POSTHOOK: Output: default@tbl2 POSTHOOK: Output: default@tbl2@p=p3 PREHOOK: query: alter table tbl2 enable no_drop cascade PREHOOK: type: ALTERTABLE_PROTECTMODE diff --git a/ql/src/test/results/clientpositive/ptf.q.out b/ql/src/test/results/clientpositive/ptf.q.out index 1932b93..3bd2db2 100644 --- a/ql/src/test/results/clientpositive/ptf.q.out +++ b/ql/src/test/results/clientpositive/ptf.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: --1. test1 select p_mfgr, p_name, p_size, @@ -821,6 +825,7 @@ r INT, dr INT, s DOUBLE) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- 17. testMultipleInserts2SWQsWithPTF CREATE TABLE part_4( p_mfgr STRING, @@ -830,6 +835,7 @@ r INT, dr INT, s DOUBLE) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_4 PREHOOK: query: CREATE TABLE part_5( p_mfgr STRING, @@ -841,6 +847,7 @@ dr INT, cud DOUBLE, fv1 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part_5( p_mfgr STRING, p_name STRING, @@ -851,6 +858,7 @@ dr INT, cud DOUBLE, fv1 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_5 PREHOOK: query: from noop(on part partition by p_mfgr diff --git a/ql/src/test/results/clientpositive/ptf_decimal.q.out b/ql/src/test/results/clientpositive/ptf_decimal.q.out index 490ef39..bacf181 100644 --- a/ql/src/test/results/clientpositive/ptf_decimal.q.out +++ b/ql/src/test/results/clientpositive/ptf_decimal.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: -- 1. aggregate functions with decimal type diff --git a/ql/src/test/results/clientpositive/ptf_general_queries.q.out b/ql/src/test/results/clientpositive/ptf_general_queries.q.out index d1ac044..75b5e66 100644 --- a/ql/src/test/results/clientpositive/ptf_general_queries.q.out +++ b/ql/src/test/results/clientpositive/ptf_general_queries.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: -- 1. testNoPTFNoWindowing select p_mfgr, p_name, p_size diff --git a/ql/src/test/results/clientpositive/ptf_matchpath.q.out b/ql/src/test/results/clientpositive/ptf_matchpath.q.out index cf3f0ae..2ceee12 100644 --- a/ql/src/test/results/clientpositive/ptf_matchpath.q.out +++ b/ql/src/test/results/clientpositive/ptf_matchpath.q.out @@ -12,6 +12,7 @@ ARR_DELAY float, FL_NUM string ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table flights_tiny ( ORIGIN_CITY_NAME string, DEST_CITY_NAME string, @@ -22,12 +23,15 @@ ARR_DELAY float, FL_NUM string ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@flights_tiny PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@flights_tiny POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@flights_tiny PREHOOK: query: -- 1. basic Matchpath test select origin_city_name, fl_num, year, month, day_of_month, sz, tpath diff --git a/ql/src/test/results/clientpositive/ptf_rcfile.q.out b/ql/src/test/results/clientpositive/ptf_rcfile.q.out index ac0f02b..87c412f 100644 --- a/ql/src/test/results/clientpositive/ptf_rcfile.q.out +++ b/ql/src/test/results/clientpositive/ptf_rcfile.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part_rc( p_comment STRING ) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part_rc( p_partkey INT, p_name STRING, @@ -26,12 +27,15 @@ POSTHOOK: query: CREATE TABLE part_rc( p_comment STRING ) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_rc PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part.rc' overwrite into table part_rc PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part_rc POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part.rc' overwrite into table part_rc POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part_rc PREHOOK: query: -- testWindowingPTFWithPartRC select p_mfgr, p_name, p_size, diff --git a/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out b/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out index e10779a..11c9724 100644 --- a/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out +++ b/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out @@ -12,6 +12,7 @@ ARR_DELAY float, FL_NUM string ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table flights_tiny ( ORIGIN_CITY_NAME string, DEST_CITY_NAME string, @@ -22,12 +23,15 @@ ARR_DELAY float, FL_NUM string ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@flights_tiny PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@flights_tiny POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@flights_tiny PREHOOK: query: create temporary function matchpathtest as 'org.apache.hadoop.hive.ql.udf.ptf.MatchPath$MatchPathResolver' PREHOOK: type: CREATEFUNCTION diff --git a/ql/src/test/results/clientpositive/ptf_seqfile.q.out b/ql/src/test/results/clientpositive/ptf_seqfile.q.out index 9926591..2b3d76e 100644 --- a/ql/src/test/results/clientpositive/ptf_seqfile.q.out +++ b/ql/src/test/results/clientpositive/ptf_seqfile.q.out @@ -14,6 +14,7 @@ PREHOOK: query: CREATE TABLE part_seq( p_comment STRING ) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part_seq( p_partkey INT, p_name STRING, @@ -26,12 +27,15 @@ POSTHOOK: query: CREATE TABLE part_seq( p_comment STRING ) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_seq PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part.seq' overwrite into table part_seq PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part_seq POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part.seq' overwrite into table part_seq POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part_seq PREHOOK: query: -- testWindowingPTFWithPartSeqFile select p_mfgr, p_name, p_size, diff --git a/ql/src/test/results/clientpositive/push_or.q.out b/ql/src/test/results/clientpositive/push_or.q.out index 8864ebf..9773eee 100644 --- a/ql/src/test/results/clientpositive/push_or.q.out +++ b/ql/src/test/results/clientpositive/push_or.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table push_or POSTHOOK: type: DROPTABLE PREHOOK: query: create table push_or (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table push_or (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@push_or PREHOOK: query: insert overwrite table push_or partition (ds='2000-04-08') select * from src where key < 20 order by key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out b/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out index 84f8d93..6f948ed 100644 --- a/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out +++ b/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out @@ -21,6 +21,7 @@ PREHOOK: query: CREATE TABLE lineitem (L_ORDERKEY INT, ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE lineitem (L_ORDERKEY INT, L_PARTKEY INT, L_SUPPKEY INT, @@ -40,12 +41,15 @@ POSTHOOK: query: CREATE TABLE lineitem (L_ORDERKEY INT, ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@lineitem PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@lineitem POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@lineitem PREHOOK: query: CREATE INDEX lineitem_lshipdate_idx ON TABLE lineitem(l_shipdate) AS 'org.apache.hadoop.hive.ql.index.AggregateIndexHandler' WITH DEFERRED REBUILD IDXPROPERTIES("AGGREGATES"="count(l_shipdate)") PREHOOK: type: CREATEINDEX @@ -1007,8 +1011,10 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE tbl(key int, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl(key int, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl POSTHOOK: Lineage: default__lineitem_lineitem_lshipdate_idx__._bucketname SIMPLE [(lineitem)lineitem.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: default__lineitem_lineitem_lshipdate_idx__._count_of_l_shipdate EXPRESSION [(lineitem)lineitem.FieldSchema(name:l_shipdate, type:string, comment:null), ] @@ -2327,8 +2333,10 @@ POSTHOOK: Lineage: default__tbl_tbl_key_idx__._offsets EXPRESSION [(tbl)tbl.Fiel POSTHOOK: Lineage: default__tbl_tbl_key_idx__.key SIMPLE [(tbl)tbl.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: CREATE TABLE tblpart (key int, value string) PARTITIONED BY (ds string, hr int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tblpart (key int, value string) PARTITIONED BY (ds string, hr int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tblpart POSTHOOK: Lineage: default__lineitem_lineitem_lshipdate_idx__._bucketname SIMPLE [(lineitem)lineitem.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: default__lineitem_lineitem_lshipdate_idx__._count_of_l_shipdate EXPRESSION [(lineitem)lineitem.FieldSchema(name:l_shipdate, type:string, comment:null), ] @@ -2839,8 +2847,10 @@ POSTHOOK: Lineage: tblpart PARTITION(ds=2008-04-09,hr=12).key EXPRESSION [(srcpa POSTHOOK: Lineage: tblpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE tbl(key int, value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl(key int, value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl POSTHOOK: Lineage: default__lineitem_lineitem_lshipdate_idx__._bucketname SIMPLE [(lineitem)lineitem.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: default__lineitem_lineitem_lshipdate_idx__._count_of_l_shipdate EXPRESSION [(lineitem)lineitem.FieldSchema(name:l_shipdate, type:string, comment:null), ] @@ -2876,9 +2886,11 @@ POSTHOOK: Lineage: tblpart PARTITION(ds=2008-04-09,hr=12).key EXPRESSION [(srcpa POSTHOOK: Lineage: tblpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/tbl.txt' OVERWRITE INTO TABLE tbl PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tbl POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/tbl.txt' OVERWRITE INTO TABLE tbl POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tbl POSTHOOK: Lineage: default__lineitem_lineitem_lshipdate_idx__._bucketname SIMPLE [(lineitem)lineitem.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ] POSTHOOK: Lineage: default__lineitem_lineitem_lshipdate_idx__._count_of_l_shipdate EXPRESSION [(lineitem)lineitem.FieldSchema(name:l_shipdate, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/quote1.q.out b/ql/src/test/results/clientpositive/quote1.q.out index 6e76fe2..bf6a165 100644 --- a/ql/src/test/results/clientpositive/quote1.q.out +++ b/ql/src/test/results/clientpositive/quote1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(`location` INT, `type` STRING) PARTITIONED BY(`table` STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(`location` INT, `type` STRING) PARTITIONED BY(`table` STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src diff --git a/ql/src/test/results/clientpositive/quotedid_alter.q.out b/ql/src/test/results/clientpositive/quotedid_alter.q.out index feb7d57..7348e49 100644 --- a/ql/src/test/results/clientpositive/quotedid_alter.q.out +++ b/ql/src/test/results/clientpositive/quotedid_alter.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table src_b3(`x+1` string, `!@#$%^&*()_q` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_b3(`x+1` string, `!@#$%^&*()_q` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_b3 PREHOOK: query: alter table src_b3 clustered by (`!@#$%^&*()_q`) sorted by (`!@#$%^&*()_q`) into 2 buckets @@ -16,9 +18,11 @@ POSTHOOK: Output: default@src_b3 PREHOOK: query: -- alter partition create table src_p3(`x+1` string, `y&y` string) partitioned by (`!@#$%^&*()_q` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- alter partition create table src_p3(`x+1` string, `y&y` string) partitioned by (`!@#$%^&*()_q` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_p3 PREHOOK: query: insert overwrite table src_p3 partition(`!@#$%^&*()_q`='a') select * from src PREHOOK: type: QUERY @@ -39,10 +43,10 @@ POSTHOOK: Lineage: src_p3 PARTITION(!@#$%^&*()_q=a).y&y SIMPLE [(src)src.FieldSc !@%23$%25%5E&%2A()_q=a PREHOOK: query: alter table src_p3 add if not exists partition(`!@#$%^&*()_q`='b') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@src_p3 +PREHOOK: Output: default@src_p3 POSTHOOK: query: alter table src_p3 add if not exists partition(`!@#$%^&*()_q`='b') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@src_p3 +POSTHOOK: Output: default@src_p3 POSTHOOK: Output: default@src_p3@!@%23$%25%5E&%2A()_q=b POSTHOOK: Lineage: src_p3 PARTITION(!@#$%^&*()_q=a).x+1 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: src_p3 PARTITION(!@#$%^&*()_q=a).y&y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/quotedid_basic.q.out b/ql/src/test/results/clientpositive/quotedid_basic.q.out index 926b158..a33574c 100644 --- a/ql/src/test/results/clientpositive/quotedid_basic.q.out +++ b/ql/src/test/results/clientpositive/quotedid_basic.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- basic create table t1(`x+1` string, `y&y` string, `!@#$%^&*()_q` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- basic create table t1(`x+1` string, `y&y` string, `!@#$%^&*()_q` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: describe t1 PREHOOK: type: DESCTABLE @@ -302,9 +304,11 @@ STAGE PLANS: PREHOOK: query: -- escaped back ticks create table t4(`x+1``` string, `y&y` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- escaped back ticks create table t4(`x+1``` string, `y&y` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t4 PREHOOK: query: describe t4 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/quotedid_partition.q.out b/ql/src/test/results/clientpositive/quotedid_partition.q.out index 7e13f20..f946c93 100644 --- a/ql/src/test/results/clientpositive/quotedid_partition.q.out +++ b/ql/src/test/results/clientpositive/quotedid_partition.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table src_p(`x+1` string, `y&y` string) partitioned by (`!@#$%^&*()_q` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_p(`x+1` string, `y&y` string) partitioned by (`!@#$%^&*()_q` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_p PREHOOK: query: insert overwrite table src_p partition(`!@#$%^&*()_q`='a') select * from src PREHOOK: type: QUERY @@ -82,8 +84,10 @@ STAGE PLANS: PREHOOK: query: create table src_p2(`x+1` string) partitioned by (`!@#$%^&*()_q` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_p2(`x+1` string) partitioned by (`!@#$%^&*()_q` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_p2 POSTHOOK: Lineage: src_p PARTITION(!@#$%^&*()_q=a).x+1 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: src_p PARTITION(!@#$%^&*()_q=a).y&y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/quotedid_skew.q.out b/ql/src/test/results/clientpositive/quotedid_skew.q.out index 90b18d3..2e7f932 100644 --- a/ql/src/test/results/clientpositive/quotedid_skew.q.out +++ b/ql/src/test/results/clientpositive/quotedid_skew.q.out @@ -1,28 +1,36 @@ PREHOOK: query: CREATE TABLE T1(`!@#$%^&*()_q` string, `y&y` string) SKEWED BY (`!@#$%^&*()_q`) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(`!@#$%^&*()_q` string, `y&y` string) SKEWED BY (`!@#$%^&*()_q`) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(`!@#$%^&*()_q` string, `y&y` string) SKEWED BY (`!@#$%^&*()_q`) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(`!@#$%^&*()_q` string, `y&y` string) SKEWED BY (`!@#$%^&*()_q`) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- a simple join query with skew on both the tables on the join key -- adding a order by at the end to make the results deterministic diff --git a/ql/src/test/results/clientpositive/quotedid_smb.q.out b/ql/src/test/results/clientpositive/quotedid_smb.q.out index 8f5b9c0..f88d3c1 100644 --- a/ql/src/test/results/clientpositive/quotedid_smb.q.out +++ b/ql/src/test/results/clientpositive/quotedid_smb.q.out @@ -1,9 +1,11 @@ PREHOOK: query: create table src_b(`x+1` string, `!@#$%^&*()_q` string) clustered by (`!@#$%^&*()_q`) sorted by (`!@#$%^&*()_q`) into 2 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_b(`x+1` string, `!@#$%^&*()_q` string) clustered by (`!@#$%^&*()_q`) sorted by (`!@#$%^&*()_q`) into 2 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_b PREHOOK: query: insert overwrite table src_b select * from src @@ -20,9 +22,11 @@ POSTHOOK: Lineage: src_b.x+1 SIMPLE [(src)src.FieldSchema(name:key, type:string, PREHOOK: query: create table src_b2(`x+1` string, `!@#$%^&*()_q` string) clustered by (`!@#$%^&*()_q`) sorted by (`!@#$%^&*()_q`) into 2 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_b2(`x+1` string, `!@#$%^&*()_q` string) clustered by (`!@#$%^&*()_q`) sorted by (`!@#$%^&*()_q`) into 2 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_b2 POSTHOOK: Lineage: src_b.!@#$%^&*()_q SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: src_b.x+1 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/quotedid_tblproperty.q.out b/ql/src/test/results/clientpositive/quotedid_tblproperty.q.out index 947a605..153f148 100644 --- a/ql/src/test/results/clientpositive/quotedid_tblproperty.q.out +++ b/ql/src/test/results/clientpositive/quotedid_tblproperty.q.out @@ -2,10 +2,12 @@ PREHOOK: query: CREATE TABLE xyz(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org STORED AS TEXTFILE TBLPROPERTIES('columns'='valid_colname,invalid.colname') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE xyz(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE TBLPROPERTIES('columns'='valid_colname,invalid.colname') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@xyz PREHOOK: query: describe xyz PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out b/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out index 1b3c962..102904e 100644 --- a/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out +++ b/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- scanning partitioned data create table tmptable(key string, value string, hr string, ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- scanning partitioned data create table tmptable(key string, value string, hr string, ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: explain extended insert overwrite table tmptable diff --git a/ql/src/test/results/clientpositive/rcfile_bigdata.q.out b/ql/src/test/results/clientpositive/rcfile_bigdata.q.out index 13d8d5a..455f896 100644 --- a/ql/src/test/results/clientpositive/rcfile_bigdata.q.out +++ b/ql/src/test/results/clientpositive/rcfile_bigdata.q.out @@ -5,6 +5,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE table columnTable_Bigdata (key STRING, value STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' @@ -12,6 +13,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@columnTable_Bigdata PREHOOK: query: FROM (FROM src MAP src.key,src.value USING 'python dumpdata_script.py' AS (key,value) WHERE src.key = 10) subq INSERT OVERWRITE TABLE columnTable_Bigdata SELECT subq.key, subq.value diff --git a/ql/src/test/results/clientpositive/rcfile_columnar.q.out b/ql/src/test/results/clientpositive/rcfile_columnar.q.out index 9c51b22..50ee6d7 100644 --- a/ql/src/test/results/clientpositive/rcfile_columnar.q.out +++ b/ql/src/test/results/clientpositive/rcfile_columnar.q.out @@ -5,6 +5,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE table columnTable (key STRING, value STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' @@ -12,6 +13,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@columnTable PREHOOK: query: FROM src INSERT OVERWRITE TABLE columnTable SELECT src.key, src.value LIMIT 10 diff --git a/ql/src/test/results/clientpositive/rcfile_createas1.q.out b/ql/src/test/results/clientpositive/rcfile_createas1.q.out index 5f7814c..0eed5c6 100644 --- a/ql/src/test/results/clientpositive/rcfile_createas1.q.out +++ b/ql/src/test/results/clientpositive/rcfile_createas1.q.out @@ -9,9 +9,11 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE rcfile_createas1a (key INT, value STRING) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_createas1a (key INT, value STRING) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_createas1a PREHOOK: query: INSERT OVERWRITE TABLE rcfile_createas1a PARTITION (ds='1') SELECT * FROM src diff --git a/ql/src/test/results/clientpositive/rcfile_default_format.q.out b/ql/src/test/results/clientpositive/rcfile_default_format.q.out index a15aee5..33bf57c 100644 --- a/ql/src/test/results/clientpositive/rcfile_default_format.q.out +++ b/ql/src/test/results/clientpositive/rcfile_default_format.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE rcfile_default_format (key STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_default_format (key STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_default_format PREHOOK: query: DESCRIBE FORMATTED rcfile_default_format PREHOOK: type: DESCTABLE @@ -74,8 +76,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: CREATE TABLE rcfile_default_format_txtfile (key STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_default_format_txtfile (key STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_default_format_txtfile PREHOOK: query: INSERT OVERWRITE TABLE rcfile_default_format_txtfile SELECT key from src PREHOOK: type: QUERY @@ -208,8 +212,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: CREATE TABLE rcfile_default_format_default_serde (key STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_default_format_default_serde (key STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_default_format_default_serde POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE FORMATTED rcfile_default_format_default_serde @@ -286,8 +292,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: CREATE TABLE rcfile_default_serde (key STRING) STORED AS rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_default_serde (key STRING) STORED AS rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_default_serde POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] PREHOOK: query: DESCRIBE FORMATTED rcfile_default_serde diff --git a/ql/src/test/results/clientpositive/rcfile_lazydecompress.q.out b/ql/src/test/results/clientpositive/rcfile_lazydecompress.q.out index c6b5b7a..ff44b41 100644 --- a/ql/src/test/results/clientpositive/rcfile_lazydecompress.q.out +++ b/ql/src/test/results/clientpositive/rcfile_lazydecompress.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE table rcfileTableLazyDecompress (key STRING, value STRING) STORED AS RCFile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE table rcfileTableLazyDecompress (key STRING, value STRING) STORED AS RCFile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfileTableLazyDecompress PREHOOK: query: FROM src INSERT OVERWRITE TABLE rcfileTableLazyDecompress SELECT src.key, src.value LIMIT 10 diff --git a/ql/src/test/results/clientpositive/rcfile_merge1.q.out b/ql/src/test/results/clientpositive/rcfile_merge1.q.out index cae31b6..3ce121f 100644 --- a/ql/src/test/results/clientpositive/rcfile_merge1.q.out +++ b/ql/src/test/results/clientpositive/rcfile_merge1.q.out @@ -9,16 +9,20 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE rcfile_merge1 (key INT, value STRING) PARTITIONED BY (ds STRING, part STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_merge1 (key INT, value STRING) PARTITIONED BY (ds STRING, part STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_merge1 PREHOOK: query: CREATE TABLE rcfile_merge1b (key INT, value STRING) PARTITIONED BY (ds STRING, part STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_merge1b (key INT, value STRING) PARTITIONED BY (ds STRING, part STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_merge1b PREHOOK: query: -- Use non block-level merge EXPLAIN diff --git a/ql/src/test/results/clientpositive/rcfile_merge2.q.out b/ql/src/test/results/clientpositive/rcfile_merge2.q.out index 8b88486..0332694 100644 --- a/ql/src/test/results/clientpositive/rcfile_merge2.q.out +++ b/ql/src/test/results/clientpositive/rcfile_merge2.q.out @@ -6,10 +6,12 @@ PREHOOK: query: CREATE TABLE rcfile_merge2a (key INT, value STRING) PARTITIONED BY (one string, two string, three string) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_merge2a (key INT, value STRING) PARTITIONED BY (one string, two string, three string) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_merge2a PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge2a PARTITION (one='1', two, three) SELECT key, value, PMOD(HASH(key), 10) as two, diff --git a/ql/src/test/results/clientpositive/rcfile_merge3.q.out b/ql/src/test/results/clientpositive/rcfile_merge3.q.out index 9d0cae4..7dd9c15 100644 --- a/ql/src/test/results/clientpositive/rcfile_merge3.q.out +++ b/ql/src/test/results/clientpositive/rcfile_merge3.q.out @@ -9,14 +9,18 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE rcfile_merge3a (key int, value string) PARTITIONED BY (ds string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_merge3a (key int, value string) PARTITIONED BY (ds string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_merge3a PREHOOK: query: CREATE TABLE rcfile_merge3b (key int, value string) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_merge3b (key int, value string) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_merge3b PREHOOK: query: INSERT OVERWRITE TABLE rcfile_merge3a PARTITION (ds='1') SELECT * FROM src diff --git a/ql/src/test/results/clientpositive/rcfile_merge4.q.out b/ql/src/test/results/clientpositive/rcfile_merge4.q.out index df27acc..23802e9 100644 --- a/ql/src/test/results/clientpositive/rcfile_merge4.q.out +++ b/ql/src/test/results/clientpositive/rcfile_merge4.q.out @@ -9,14 +9,18 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE rcfile_merge3a (key int, value string) PARTITIONED BY (ds string) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_merge3a (key int, value string) PARTITIONED BY (ds string) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_merge3a PREHOOK: query: CREATE TABLE rcfile_merge3b (key int, value string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE rcfile_merge3b (key int, value string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_merge3b PREHOOK: query: INSERT OVERWRITE TABLE rcfile_merge3a PARTITION (ds='1') SELECT * FROM src diff --git a/ql/src/test/results/clientpositive/rcfile_null_value.q.out b/ql/src/test/results/clientpositive/rcfile_null_value.q.out index 9c795db..42a16c4 100644 --- a/ql/src/test/results/clientpositive/rcfile_null_value.q.out +++ b/ql/src/test/results/clientpositive/rcfile_null_value.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE src1_rc(key STRING, value STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src1_rc(key STRING, value STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src1_rc PREHOOK: query: INSERT OVERWRITE TABLE src1_rc SELECT * FROM src1 PREHOOK: type: QUERY @@ -50,8 +52,10 @@ POSTHOOK: Lineage: src1_rc.value SIMPLE [(src1)src1.FieldSchema(name:value, type PREHOOK: query: CREATE TABLE dest1_rc(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1_rc(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1_rc POSTHOOK: Lineage: src1_rc.key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: src1_rc.value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/rcfile_toleratecorruptions.q.out b/ql/src/test/results/clientpositive/rcfile_toleratecorruptions.q.out index 0f92935..3c49b10 100644 --- a/ql/src/test/results/clientpositive/rcfile_toleratecorruptions.q.out +++ b/ql/src/test/results/clientpositive/rcfile_toleratecorruptions.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE test_src(key int, value string) stored as RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_src(key int, value string) stored as RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_src PREHOOK: query: INSERT OVERWRITE table test_src SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/rcfile_union.q.out b/ql/src/test/results/clientpositive/rcfile_union.q.out index d1ea976..5ac0af1 100644 --- a/ql/src/test/results/clientpositive/rcfile_union.q.out +++ b/ql/src/test/results/clientpositive/rcfile_union.q.out @@ -3,11 +3,13 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE table rcfile_unionTable (b STRING, c STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@rcfile_unionTable PREHOOK: query: FROM src INSERT OVERWRITE TABLE rcfile_unionTable SELECT src.key, src.value LIMIT 10 diff --git a/ql/src/test/results/clientpositive/reduce_deduplicate.q.out b/ql/src/test/results/clientpositive/reduce_deduplicate.q.out index 03cc441..42ede17 100644 --- a/ql/src/test/results/clientpositive/reduce_deduplicate.q.out +++ b/ql/src/test/results/clientpositive/reduce_deduplicate.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE bucket5_1(key string, value string) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket5_1(key string, value string) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket5_1 PREHOOK: query: explain extended insert overwrite table bucket5_1 @@ -199,15 +201,19 @@ POSTHOOK: Lineage: bucket5_1.value SIMPLE [(src)src.FieldSchema(name:value, type 21025334 36210398070 PREHOOK: query: create table complex_tbl_1(aid string, bid string, t int, ctime string, etime bigint, l string, et string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table complex_tbl_1(aid string, bid string, t int, ctime string, etime bigint, l string, et string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@complex_tbl_1 POSTHOOK: Lineage: bucket5_1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: bucket5_1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table complex_tbl_2(aet string, aes string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table complex_tbl_2(aet string, aes string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@complex_tbl_2 POSTHOOK: Lineage: bucket5_1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: bucket5_1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out b/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out index 51385c0..1b3ed8e 100644 --- a/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out +++ b/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table t1( key_int1 int, key_int2 int, key_string1 string, key_string2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t1( key_int1 int, key_int2 int, key_string1 string, key_string2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: select Q1.key_int1, sum(Q1.key_int1) from (select * from t1 cluster by key_int1) Q1 group by Q1.key_int1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/reducesink_dedup.q.out b/ql/src/test/results/clientpositive/reducesink_dedup.q.out index 32dfdd4..a353f14 100644 --- a/ql/src/test/results/clientpositive/reducesink_dedup.q.out +++ b/ql/src/test/results/clientpositive/reducesink_dedup.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,6 +29,7 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: select p_name from (select p_name from part distribute by 1 sort by 1) p diff --git a/ql/src/test/results/clientpositive/remote_script.q.out b/ql/src/test/results/clientpositive/remote_script.q.out index 8806b2b..cff76a7 100644 --- a/ql/src/test/results/clientpositive/remote_script.q.out +++ b/ql/src/test/results/clientpositive/remote_script.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tmp_tmp(key string, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp_tmp(key string, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_tmp PREHOOK: query: insert overwrite table tmp_tmp SELECT TRANSFORM(key, value) USING diff --git a/ql/src/test/results/clientpositive/rename_column.q.out b/ql/src/test/results/clientpositive/rename_column.q.out index 3627264..4de0724 100644 --- a/ql/src/test/results/clientpositive/rename_column.q.out +++ b/ql/src/test/results/clientpositive/rename_column.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE kv_rename_test(a int, b int, c int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE kv_rename_test(a int, b int, c int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@kv_rename_test PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE @@ -148,8 +150,10 @@ POSTHOOK: query: USE kv_rename_test_db POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE kv_rename_test(a int, b int, c int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:kv_rename_test_db POSTHOOK: query: CREATE TABLE kv_rename_test(a int, b int, c int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:kv_rename_test_db POSTHOOK: Output: kv_rename_test_db@kv_rename_test PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/rename_external_partition_location.q.out b/ql/src/test/results/clientpositive/rename_external_partition_location.q.out index bff9191..840f4c8 100644 --- a/ql/src/test/results/clientpositive/rename_external_partition_location.q.out +++ b/ql/src/test/results/clientpositive/rename_external_partition_location.q.out @@ -3,11 +3,15 @@ PREHOOK: query: CREATE EXTERNAL TABLE ex_table ( key INT, value STRING) STORED AS textfile #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: CREATE EXTERNAL TABLE ex_table ( key INT, value STRING) PARTITIONED BY (part STRING) STORED AS textfile #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@ex_table PREHOOK: query: INSERT OVERWRITE TABLE ex_table PARTITION (part='part1') SELECT key, value FROM src WHERE key < 10 diff --git a/ql/src/test/results/clientpositive/rename_partition_location.q.out b/ql/src/test/results/clientpositive/rename_partition_location.q.out index 3086aa2..5d86f6d 100644 --- a/ql/src/test/results/clientpositive/rename_partition_location.q.out +++ b/ql/src/test/results/clientpositive/rename_partition_location.q.out @@ -5,6 +5,8 @@ CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (p STORED AS RCFILE #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that if the tables location changes, renaming a partition will not change -- the partition location accordingly @@ -12,6 +14,8 @@ CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (p STORED AS RCFILE #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@rename_partition_table PREHOOK: query: INSERT OVERWRITE TABLE rename_partition_table PARTITION (part = '1') SELECT * FROM src PREHOOK: type: QUERY @@ -31,6 +35,7 @@ PREHOOK: Output: default@rename_partition_table POSTHOOK: type: ALTERTABLE_LOCATION POSTHOOK: Input: default@rename_partition_table POSTHOOK: Output: default@rename_partition_table +#### A masked pattern was here #### POSTHOOK: Lineage: rename_partition_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: rename_partition_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: ALTER TABLE rename_partition_table PARTITION (part = '1') RENAME TO PARTITION (part = '2') diff --git a/ql/src/test/results/clientpositive/rename_table_location.q.out b/ql/src/test/results/clientpositive/rename_table_location.q.out index bf79ea3..351bfc0 100644 --- a/ql/src/test/results/clientpositive/rename_table_location.q.out +++ b/ql/src/test/results/clientpositive/rename_table_location.q.out @@ -5,6 +5,8 @@ CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (p STORED AS RCFILE #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that if the tables location changes, renaming a table will not change -- the table location scheme @@ -12,6 +14,8 @@ CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (p STORED AS RCFILE #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@rename_partition_table PREHOOK: query: INSERT OVERWRITE TABLE rename_partition_table PARTITION (part = '1') SELECT * FROM src PREHOOK: type: QUERY @@ -31,6 +35,7 @@ PREHOOK: Output: default@rename_partition_table POSTHOOK: type: ALTERTABLE_LOCATION POSTHOOK: Input: default@rename_partition_table POSTHOOK: Output: default@rename_partition_table +#### A masked pattern was here #### POSTHOOK: Lineage: rename_partition_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: rename_partition_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: -- If the metastore attempts to change the scheme of the table back to the default pfile, it will get diff --git a/ql/src/test/results/clientpositive/repair.q.out b/ql/src/test/results/clientpositive/repair.q.out index 553c4c1..012589b 100644 --- a/ql/src/test/results/clientpositive/repair.q.out +++ b/ql/src/test/results/clientpositive/repair.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: DROP TABLE IF EXISTS repairtable POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@repairtable PREHOOK: query: MSCK TABLE repairtable PREHOOK: type: MSCK diff --git a/ql/src/test/results/clientpositive/root_dir_external_table.q.out b/ql/src/test/results/clientpositive/root_dir_external_table.q.out index dfd8671..0e6067d 100644 --- a/ql/src/test/results/clientpositive/root_dir_external_table.q.out +++ b/ql/src/test/results/clientpositive/root_dir_external_table.q.out @@ -7,7 +7,11 @@ POSTHOOK: Input: default@src #### A masked pattern was here #### PREHOOK: type: CREATETABLE #### A masked pattern was here #### +PREHOOK: Output: database:default +#### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@roottable PREHOOK: query: select count(*) from roottable PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/sample1.q.out b/ql/src/test/results/clientpositive/sample1.q.out index eb7a552..c54b80e 100644 --- a/ql/src/test/results/clientpositive/sample1.q.out +++ b/ql/src/test/results/clientpositive/sample1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING, dt STRING, hr STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING, dt STRING, hr STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: -- no input pruning, no sample filter EXPLAIN EXTENDED diff --git a/ql/src/test/results/clientpositive/sample10.q.out b/ql/src/test/results/clientpositive/sample10.q.out index beca660..1cf5caa 100644 --- a/ql/src/test/results/clientpositive/sample10.q.out +++ b/ql/src/test/results/clientpositive/sample10.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) create table srcpartbucket (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 4 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) create table srcpartbucket (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 4 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpartbucket PREHOOK: query: insert overwrite table srcpartbucket partition(ds, hr) select * from srcpart where ds is not null and key < 10 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/sample2.q.out b/ql/src/test/results/clientpositive/sample2.q.out index 6282873..0a40c1b 100644 --- a/ql/src/test/results/clientpositive/sample2.q.out +++ b/ql/src/test/results/clientpositive/sample2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: -- input pruning, no sample filter -- default table sample columns diff --git a/ql/src/test/results/clientpositive/sample4.q.out b/ql/src/test/results/clientpositive/sample4.q.out index 859e0c4..a7cf806 100644 --- a/ql/src/test/results/clientpositive/sample4.q.out +++ b/ql/src/test/results/clientpositive/sample4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: -- bucket column is the same as table sample -- No need for sample filter diff --git a/ql/src/test/results/clientpositive/sample5.q.out b/ql/src/test/results/clientpositive/sample5.q.out index 60855f4..32415ee 100644 --- a/ql/src/test/results/clientpositive/sample5.q.out +++ b/ql/src/test/results/clientpositive/sample5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: -- no input pruning, sample filter EXPLAIN EXTENDED diff --git a/ql/src/test/results/clientpositive/sample6.q.out b/ql/src/test/results/clientpositive/sample6.q.out index 32a1141..40474c2 100644 --- a/ql/src/test/results/clientpositive/sample6.q.out +++ b/ql/src/test/results/clientpositive/sample6.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: -- both input pruning and sample filter EXPLAIN EXTENDED @@ -3115,8 +3117,10 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(srcbucket)s.FieldSchema(name:value, type 489 val_489 PREHOOK: query: CREATE TABLE empty_bucket (key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE empty_bucket (key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@empty_bucket POSTHOOK: Lineage: dest1.key SIMPLE [(srcbucket)s.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: dest1.value SIMPLE [(srcbucket)s.FieldSchema(name:value, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/sample7.q.out b/ql/src/test/results/clientpositive/sample7.q.out index cf018f5..9d582f9 100644 --- a/ql/src/test/results/clientpositive/sample7.q.out +++ b/ql/src/test/results/clientpositive/sample7.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: -- both input pruning and sample filter EXPLAIN EXTENDED diff --git a/ql/src/test/results/clientpositive/sample_islocalmode_hook_hadoop20.q.out b/ql/src/test/results/clientpositive/sample_islocalmode_hook_hadoop20.q.out index 96956b2..0e2f270 100644 --- a/ql/src/test/results/clientpositive/sample_islocalmode_hook_hadoop20.q.out +++ b/ql/src/test/results/clientpositive/sample_islocalmode_hook_hadoop20.q.out @@ -13,6 +13,7 @@ PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) -- create file inputs create table sih_i_part (key int, value string) partitioned by (p string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) -- This test sets mapred.max.split.size=300 and hive.merge.smallfiles.avgsize=1 -- in an attempt to force the generation of multiple splits and multiple output files. @@ -24,6 +25,7 @@ POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) -- create file inputs create table sih_i_part (key int, value string) partitioned by (p string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@sih_i_part PREHOOK: query: insert overwrite table sih_i_part partition (p='1') select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/schemeAuthority.q.out b/ql/src/test/results/clientpositive/schemeAuthority.q.out index eabee19..d64ee55 100644 --- a/ql/src/test/results/clientpositive/schemeAuthority.q.out +++ b/ql/src/test/results/clientpositive/schemeAuthority.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create external table dynPart (key string) partitioned by (value string) row format delimited fields terminated by '\\t' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create external table dynPart (key string) partitioned by (value string) row format delimited fields terminated by '\\t' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dynPart #### A masked pattern was here #### PREHOOK: type: QUERY @@ -17,17 +19,21 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@dynpart +#### A masked pattern was here #### +PREHOOK: Output: default@dynpart #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@dynpart +#### A masked pattern was here #### +POSTHOOK: Output: default@dynpart POSTHOOK: Output: default@dynpart@value=0 #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@dynpart +#### A masked pattern was here #### +PREHOOK: Output: default@dynpart #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@dynpart +#### A masked pattern was here #### +POSTHOOK: Output: default@dynpart POSTHOOK: Output: default@dynpart@value=1 PREHOOK: query: select count(*) from dynPart PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/schemeAuthority2.q.out b/ql/src/test/results/clientpositive/schemeAuthority2.q.out index 4248270..0aa13e8 100644 --- a/ql/src/test/results/clientpositive/schemeAuthority2.q.out +++ b/ql/src/test/results/clientpositive/schemeAuthority2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create external table dynPart (key string) partitioned by (value string, value2 string) row format delimited fields terminated by '\\t' stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create external table dynPart (key string) partitioned by (value string, value2 string) row format delimited fields terminated by '\\t' stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dynPart #### A masked pattern was here #### PREHOOK: type: QUERY @@ -17,17 +19,21 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@dynpart +#### A masked pattern was here #### +PREHOOK: Output: default@dynpart #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@dynpart +#### A masked pattern was here #### +POSTHOOK: Output: default@dynpart POSTHOOK: Output: default@dynpart@value=0/value2=clusterA #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@dynpart +#### A masked pattern was here #### +PREHOOK: Output: default@dynpart #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@dynpart +#### A masked pattern was here #### +POSTHOOK: Output: default@dynpart POSTHOOK: Output: default@dynpart@value=0/value2=clusterB PREHOOK: query: select value2, key from dynPart where value='0' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/scriptfile1.q.out b/ql/src/test/results/clientpositive/scriptfile1.q.out index f3ed98b..3fda52d 100644 --- a/ql/src/test/results/clientpositive/scriptfile1.q.out +++ b/ql/src/test/results/clientpositive/scriptfile1.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- EXCLUDE_OS_WINDOWS CREATE TABLE dest1(key INT, value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- EXCLUDE_OS_WINDOWS CREATE TABLE dest1(key INT, value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM ( FROM src diff --git a/ql/src/test/results/clientpositive/select_unquote_and.q.out b/ql/src/test/results/clientpositive/select_unquote_and.q.out index bb02285..1dfce0f 100644 --- a/ql/src/test/results/clientpositive/select_unquote_and.q.out +++ b/ql/src/test/results/clientpositive/select_unquote_and.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@npe_test PREHOOK: query: INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-11') SELECT src.key, src.value FROM src WHERE key < '200' diff --git a/ql/src/test/results/clientpositive/select_unquote_not.q.out b/ql/src/test/results/clientpositive/select_unquote_not.q.out index 36f5c77..dc6a08c 100644 --- a/ql/src/test/results/clientpositive/select_unquote_not.q.out +++ b/ql/src/test/results/clientpositive/select_unquote_not.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@npe_test PREHOOK: query: INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-11') SELECT src.key, src.value FROM src WHERE key < '200' diff --git a/ql/src/test/results/clientpositive/select_unquote_or.q.out b/ql/src/test/results/clientpositive/select_unquote_or.q.out index 5b68691..3d06341 100644 --- a/ql/src/test/results/clientpositive/select_unquote_or.q.out +++ b/ql/src/test/results/clientpositive/select_unquote_or.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@npe_test PREHOOK: query: INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-11') SELECT src.key, src.value FROM src WHERE key < '200' diff --git a/ql/src/test/results/clientpositive/semijoin.q.out b/ql/src/test/results/clientpositive/semijoin.q.out index 9fa5bb9..37800b6 100644 --- a/ql/src/test/results/clientpositive/semijoin.q.out +++ b/ql/src/test/results/clientpositive/semijoin.q.out @@ -91,8 +91,10 @@ POSTHOOK: Input: default@t3 20 val_10 PREHOOK: query: create table t4 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t4 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t4 PREHOOK: query: select * from t4 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/serde_regex.q.out b/ql/src/test/results/clientpositive/serde_regex.q.out index 86e3cc6..e231a09 100644 --- a/ql/src/test/results/clientpositive/serde_regex.q.out +++ b/ql/src/test/results/clientpositive/serde_regex.q.out @@ -63,6 +63,7 @@ WITH SERDEPROPERTIES ( ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE serde_regex( host STRING, identity STRING, @@ -79,18 +80,23 @@ WITH SERDEPROPERTIES ( ) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@serde_regex PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@serde_regex POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@serde_regex PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@serde_regex POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@serde_regex PREHOOK: query: SELECT * FROM serde_regex ORDER BY time PREHOOK: type: QUERY @@ -164,6 +170,7 @@ WITH SERDEPROPERTIES ( ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE serde_regex1( key decimal(38,18), value int) @@ -173,12 +180,15 @@ WITH SERDEPROPERTIES ( ) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@serde_regex1 PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/kv7.txt" INTO TABLE serde_regex1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@serde_regex1 POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/kv7.txt" INTO TABLE serde_regex1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@serde_regex1 PREHOOK: query: SELECT key, value FROM serde_regex1 ORDER BY key, value PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/serde_reported_schema.q.out b/ql/src/test/results/clientpositive/serde_reported_schema.q.out index 4ff568d..d8a479f 100644 --- a/ql/src/test/results/clientpositive/serde_reported_schema.q.out +++ b/ql/src/test/results/clientpositive/serde_reported_schema.q.out @@ -5,6 +5,7 @@ PREHOOK: query: create table int_string "serialization.class"="org.apache.hadoop.hive.serde2.thrift.test.IntString", "serialization.format"="org.apache.thrift.protocol.TBinaryProtocol") PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table int_string partitioned by (b string) row format serde "org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer" @@ -12,6 +13,7 @@ POSTHOOK: query: create table int_string "serialization.class"="org.apache.hadoop.hive.serde2.thrift.test.IntString", "serialization.format"="org.apache.thrift.protocol.TBinaryProtocol") POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@int_string PREHOOK: query: describe extended int_string PREHOOK: type: DESCTABLE @@ -30,10 +32,10 @@ b string None #### A masked pattern was here #### PREHOOK: query: alter table int_string add partition (b='part1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@int_string +PREHOOK: Output: default@int_string POSTHOOK: query: alter table int_string add partition (b='part1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@int_string +POSTHOOK: Output: default@int_string POSTHOOK: Output: default@int_string@b=part1 PREHOOK: query: describe extended int_string partition (b='part1') PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/show_columns.q.out b/ql/src/test/results/clientpositive/show_columns.q.out index 5212cfc..fa1d444 100644 --- a/ql/src/test/results/clientpositive/show_columns.q.out +++ b/ql/src/test/results/clientpositive/show_columns.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE shcol_test(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE shcol_test(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@shcol_test PREHOOK: query: EXPLAIN SHOW COLUMNS from shcol_test @@ -43,8 +45,10 @@ POSTHOOK: query: USE test_db POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE foo(a INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: CREATE TABLE foo(a INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@foo PREHOOK: query: -- SHOW COLUMNS basic syntax tests USE test_db @@ -78,8 +82,10 @@ POSTHOOK: query: USE `database` POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE foo(a INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:database POSTHOOK: query: CREATE TABLE foo(a INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:database POSTHOOK: Output: database@foo PREHOOK: query: SHOW COLUMNS from foo PREHOOK: type: SHOWCOLUMNS diff --git a/ql/src/test/results/clientpositive/show_create_table_alter.q.out b/ql/src/test/results/clientpositive/show_create_table_alter.q.out index 69a9962..64eb114 100644 --- a/ql/src/test/results/clientpositive/show_create_table_alter.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_alter.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Test SHOW CREATE TABLE on an external, clustered and sorted t CREATE EXTERNAL TABLE tmp_showcrt1 (key smallint, value float) CLUSTERED BY (key) SORTED BY (value DESC) INTO 5 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test SHOW CREATE TABLE on an external, clustered and sorted table. Then test the query again after ALTERs. CREATE EXTERNAL TABLE tmp_showcrt1 (key smallint, value float) CLUSTERED BY (key) SORTED BY (value DESC) INTO 5 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_showcrt1 PREHOOK: query: SHOW CREATE TABLE tmp_showcrt1 PREHOOK: type: SHOW_CREATETABLE diff --git a/ql/src/test/results/clientpositive/show_create_table_db_table.q.out b/ql/src/test/results/clientpositive/show_create_table_db_table.q.out index d36e8b0..528dd36 100644 --- a/ql/src/test/results/clientpositive/show_create_table_db_table.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_db_table.q.out @@ -14,8 +14,10 @@ default tmp_feng PREHOOK: query: CREATE TABLE tmp_feng.tmp_showcrt (key string, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:tmp_feng POSTHOOK: query: CREATE TABLE tmp_feng.tmp_showcrt (key string, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:tmp_feng POSTHOOK: Output: tmp_feng@tmp_showcrt PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE diff --git a/ql/src/test/results/clientpositive/show_create_table_delimited.q.out b/ql/src/test/results/clientpositive/show_create_table_delimited.q.out index 088b075..d4ffd53 100644 --- a/ql/src/test/results/clientpositive/show_create_table_delimited.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_delimited.q.out @@ -5,6 +5,8 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' COLLECTION ITEMS TERMINATED BY '|' STORED AS textfile #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: -- Test SHOW CREATE TABLE on a table with delimiters, stored format, and location. CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint) @@ -12,6 +14,8 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' COLLECTION ITEMS TERMINATED BY '|' STORED AS textfile #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_showcrt1 PREHOOK: query: SHOW CREATE TABLE tmp_showcrt1 PREHOOK: type: SHOW_CREATETABLE diff --git a/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out b/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out index b66ea9e..6b6b233 100644 --- a/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out @@ -4,12 +4,14 @@ CREATE EXTERNAL TABLE tmp_showcrt1 (key string, newvalue boolean COMMENT 'a new COMMENT 'temporary table' PARTITIONED BY (value bigint COMMENT 'some value') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test SHOW CREATE TABLE on a table with partitions and column comments. CREATE EXTERNAL TABLE tmp_showcrt1 (key string, newvalue boolean COMMENT 'a new value') COMMENT 'temporary table' PARTITIONED BY (value bigint COMMENT 'some value') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_showcrt1 PREHOOK: query: SHOW CREATE TABLE tmp_showcrt1 PREHOOK: type: SHOW_CREATETABLE diff --git a/ql/src/test/results/clientpositive/show_create_table_serde.q.out b/ql/src/test/results/clientpositive/show_create_table_serde.q.out index 811ae4a..a9e92b4 100644 --- a/ql/src/test/results/clientpositive/show_create_table_serde.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_serde.q.out @@ -7,6 +7,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test SHOW CREATE TABLE on a table with serde. -- without a storage handler @@ -16,6 +17,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_showcrt1 PREHOOK: query: SHOW CREATE TABLE tmp_showcrt1 PREHOOK: type: SHOW_CREATETABLE @@ -52,12 +54,14 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' WITH SERDEPROPERTIES ('field.delim'=',', 'serialization.format'='$') PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- with a storage handler and serde properties CREATE EXTERNAL TABLE tmp_showcrt1 (key string, value boolean) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' WITH SERDEPROPERTIES ('field.delim'=',', 'serialization.format'='$') POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_showcrt1 PREHOOK: query: SHOW CREATE TABLE tmp_showcrt1 PREHOOK: type: SHOW_CREATETABLE diff --git a/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out b/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out index 2f598b1..dae6e3f 100644 --- a/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out +++ b/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: DROP TABLE show_idx_full POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE show_idx_empty(KEY STRING, VALUE STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE show_idx_empty(KEY STRING, VALUE STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@show_idx_empty PREHOOK: query: CREATE TABLE show_idx_full(KEY STRING, VALUE1 STRING, VALUE2 STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE show_idx_full(KEY STRING, VALUE1 STRING, VALUE2 STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@show_idx_full PREHOOK: query: CREATE INDEX idx_1 ON TABLE show_idx_full(KEY) AS "COMPACT" WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX diff --git a/ql/src/test/results/clientpositive/show_indexes_syntax.q.out b/ql/src/test/results/clientpositive/show_indexes_syntax.q.out index 070ba57..8accd27 100644 --- a/ql/src/test/results/clientpositive/show_indexes_syntax.q.out +++ b/ql/src/test/results/clientpositive/show_indexes_syntax.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: DROP TABLE show_idx_t1 POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE show_idx_t1(KEY STRING, VALUE STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE show_idx_t1(KEY STRING, VALUE STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@show_idx_t1 PREHOOK: query: CREATE INDEX idx_t1 ON TABLE show_idx_t1(KEY) AS "COMPACT" WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX diff --git a/ql/src/test/results/clientpositive/show_tables.q.out b/ql/src/test/results/clientpositive/show_tables.q.out index fddb234..ed503fb 100644 --- a/ql/src/test/results/clientpositive/show_tables.q.out +++ b/ql/src/test/results/clientpositive/show_tables.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE shtb_test1(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE shtb_test1(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@shtb_test1 PREHOOK: query: CREATE TABLE shtb_test2(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE shtb_test2(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@shtb_test2 PREHOOK: query: EXPLAIN SHOW TABLES 'shtb_*' @@ -74,18 +78,24 @@ POSTHOOK: query: USE test_db POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE foo(a INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: CREATE TABLE foo(a INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@foo PREHOOK: query: CREATE TABLE bar(a INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: CREATE TABLE bar(a INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@bar PREHOOK: query: CREATE TABLE baz(a INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:test_db POSTHOOK: query: CREATE TABLE baz(a INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:test_db POSTHOOK: Output: test_db@baz PREHOOK: query: -- SHOW TABLES basic syntax tests USE default @@ -157,8 +167,10 @@ POSTHOOK: query: USE `database` POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE foo(a INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:database POSTHOOK: query: CREATE TABLE foo(a INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:database POSTHOOK: Output: database@foo PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE diff --git a/ql/src/test/results/clientpositive/show_tblproperties.q.out b/ql/src/test/results/clientpositive/show_tblproperties.q.out index a39e217..8ca4683 100644 --- a/ql/src/test/results/clientpositive/show_tblproperties.q.out +++ b/ql/src/test/results/clientpositive/show_tblproperties.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tmpfoo (a String) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmpfoo (a String) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmpfoo PREHOOK: query: show tblproperties tmpfoo("bar") PREHOOK: type: SHOW_TBLPROPERTIES diff --git a/ql/src/test/results/clientpositive/skewjoin.q.out b/ql/src/test/results/clientpositive/skewjoin.q.out index 214e7df..5f53f86 100644 --- a/ql/src/test/results/clientpositive/skewjoin.q.out +++ b/ql/src/test/results/clientpositive/skewjoin.q.out @@ -1,51 +1,69 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T4 PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t4 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t4 PREHOOK: query: EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) diff --git a/ql/src/test/results/clientpositive/skewjoinopt1.q.out b/ql/src/test/results/clientpositive/skewjoinopt1.q.out index 2acf4ff..b4f8c78 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt1.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt1.q.out @@ -1,28 +1,36 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- a simple join query with skew on both the tables on the join key -- adding a order by at the end to make the results deterministic diff --git a/ql/src/test/results/clientpositive/skewjoinopt10.q.out b/ql/src/test/results/clientpositive/skewjoinopt10.q.out index 95d4b32..4aaf328 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt10.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt10.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE T1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: drop table array_valued_T1 PREHOOK: type: DROPTABLE @@ -15,8 +19,10 @@ POSTHOOK: query: drop table array_valued_T1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table array_valued_T1 (key string, value array) SKEWED BY (key) ON ((8)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table array_valued_T1 (key string, value array) SKEWED BY (key) ON ((8)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@array_valued_T1 PREHOOK: query: insert overwrite table array_valued_T1 select key, array(value) from T1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/skewjoinopt11.q.out b/ql/src/test/results/clientpositive/skewjoinopt11.q.out index 0495d1e..ac1a6ee 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt11.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt11.q.out @@ -1,26 +1,34 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- This test is to verify the skew join compile optimization when the join is followed -- by a union. Both sides of a union consist of a join, which should have used diff --git a/ql/src/test/results/clientpositive/skewjoinopt12.q.out b/ql/src/test/results/clientpositive/skewjoinopt12.q.out index a68543c..7cfd952 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt12.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt12.q.out @@ -1,28 +1,36 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12), (8, 18)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12), (8, 18)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key, val) ON ((3, 13), (8, 18)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key, val) ON ((3, 13), (8, 18)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- Both the join tables are skewed by 2 keys, and one of the skewed values -- is common to both the tables. The join key matches the skewed key set. diff --git a/ql/src/test/results/clientpositive/skewjoinopt13.q.out b/ql/src/test/results/clientpositive/skewjoinopt13.q.out index c74edf6..a652e95 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt13.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt13.q.out @@ -1,37 +1,49 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) SKEWED BY (val) ON ((12)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) SKEWED BY (val) ON ((12)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: -- This test is for skewed join compile time optimization for more than 2 tables. -- The join key for table 3 is different from the join key used for joining diff --git a/ql/src/test/results/clientpositive/skewjoinopt14.q.out b/ql/src/test/results/clientpositive/skewjoinopt14.q.out index f2791ca..84898b8 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt14.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt14.q.out @@ -1,39 +1,51 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) SKEWED BY (val) ON ((12)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) SKEWED BY (val) ON ((12)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: -- This test is for skewed join compile time optimization for more than 2 tables. -- The join key for table 3 is different from the join key used for joining diff --git a/ql/src/test/results/clientpositive/skewjoinopt15.q.out b/ql/src/test/results/clientpositive/skewjoinopt15.q.out index 58ba052..f0ba095 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt15.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt15.q.out @@ -1,20 +1,26 @@ PREHOOK: query: CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmpT1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE tmpT1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmpt1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE tmpT1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmpt1 PREHOOK: query: -- testing skew on other data types - int CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- testing skew on other data types - int CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: INSERT OVERWRITE TABLE T1 SELECT key, val FROM tmpT1 PREHOOK: type: QUERY @@ -28,23 +34,29 @@ POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:st POSTHOOK: Lineage: t1.val SIMPLE [(tmpt1)tmpt1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE tmpT2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmpT2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmpT2 POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(tmpt1)tmpt1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE tmpT2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmpt2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE tmpT2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmpt2 POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(tmpt1)tmpt1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: CREATE TABLE T2(key INT, val STRING) SKEWED BY (key) ON ((3)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key INT, val STRING) SKEWED BY (key) ON ((3)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(tmpt1)tmpt1.FieldSchema(name:val, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/skewjoinopt16.q.out b/ql/src/test/results/clientpositive/skewjoinopt16.q.out index d5461d5..4a1134c 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt16.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt16.q.out @@ -1,28 +1,36 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is -- skewed by one column. Ths join is performed on the both the columns diff --git a/ql/src/test/results/clientpositive/skewjoinopt17.q.out b/ql/src/test/results/clientpositive/skewjoinopt17.q.out index d293c12..1a1d923 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt17.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt17.q.out @@ -1,28 +1,36 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is -- skewed by one column. Ths join is performed on the first skewed column @@ -214,28 +222,36 @@ POSTHOOK: Output: default@t2 PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is -- skewed by one column. Ths join is performed on the both the columns diff --git a/ql/src/test/results/clientpositive/skewjoinopt18.q.out b/ql/src/test/results/clientpositive/skewjoinopt18.q.out index d8dadc8..498e5e7 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt18.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt18.q.out @@ -1,20 +1,26 @@ PREHOOK: query: CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmpT1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE tmpT1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmpt1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE tmpT1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmpt1 PREHOOK: query: -- testing skew on other data types - int CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- testing skew on other data types - int CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: INSERT OVERWRITE TABLE T1 SELECT key, val FROM tmpT1 PREHOOK: type: QUERY @@ -32,20 +38,24 @@ PREHOOK: query: -- Tke skewed column is same in both the tables, however it is CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tke skewed column is same in both the tables, however it is -- INT in one of the tables, and STRING in the other table CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(tmpt1)tmpt1.FieldSchema(name:val, type:string, comment:null), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ] POSTHOOK: Lineage: t1.val SIMPLE [(tmpt1)tmpt1.FieldSchema(name:val, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/skewjoinopt19.q.out b/ql/src/test/results/clientpositive/skewjoinopt19.q.out index 2790a0a..c100542 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt19.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt19.q.out @@ -2,27 +2,35 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) INTO 4 BUCKETS SKEWED BY (key) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) INTO 4 BUCKETS SKEWED BY (key) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- add a test where the skewed key is also the bucketized key -- it should not matter, and the compile time skewed join diff --git a/ql/src/test/results/clientpositive/skewjoinopt2.q.out b/ql/src/test/results/clientpositive/skewjoinopt2.q.out index 5a0ff80..9c90917 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt2.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt2.q.out @@ -1,28 +1,36 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2), (7)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2), (7)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- a simple query with skew on both the tables on the join key -- multiple skew values are present for the skewed keys diff --git a/ql/src/test/results/clientpositive/skewjoinopt20.q.out b/ql/src/test/results/clientpositive/skewjoinopt20.q.out index a616197..91e4d3d 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt20.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt20.q.out @@ -2,27 +2,35 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS SKEWED BY (key) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS SKEWED BY (key) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- add a test where the skewed key is also the bucketized/sorted key -- it should not matter, and the compile time skewed join diff --git a/ql/src/test/results/clientpositive/skewjoinopt3.q.out b/ql/src/test/results/clientpositive/skewjoinopt3.q.out index 0c78342..e0c17e9 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt3.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt3.q.out @@ -1,28 +1,36 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- a simple query with skew on both the tables. One of the skewed -- value is common to both the tables. The skewed value should not be diff --git a/ql/src/test/results/clientpositive/skewjoinopt4.q.out b/ql/src/test/results/clientpositive/skewjoinopt4.q.out index ae8d5ce..3cf9be9 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt4.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt4.q.out @@ -1,26 +1,34 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- only of the tables of the join (the left table of the join) is skewed -- the skewed filter would still be applied to both the tables diff --git a/ql/src/test/results/clientpositive/skewjoinopt5.q.out b/ql/src/test/results/clientpositive/skewjoinopt5.q.out index ab8d169..febca21 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt5.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt5.q.out @@ -1,28 +1,36 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is -- skewed by one column. Ths join is performed on the first skewed column diff --git a/ql/src/test/results/clientpositive/skewjoinopt6.q.out b/ql/src/test/results/clientpositive/skewjoinopt6.q.out index 4da0473..9b05b91 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt6.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt6.q.out @@ -1,28 +1,36 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12), (8, 18)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key, val) ON ((2, 12), (8, 18)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key, val) ON ((3, 13), (8, 18)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key, val) ON ((3, 13), (8, 18)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- Both the join tables are skewed by 2 keys, and one of the skewed values -- is common to both the tables. The join key is a subset of the skewed key set: diff --git a/ql/src/test/results/clientpositive/skewjoinopt7.q.out b/ql/src/test/results/clientpositive/skewjoinopt7.q.out index 9262dba..4f205db 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt7.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt7.q.out @@ -1,39 +1,51 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: -- This test is for validating skewed join compile time optimization for more than -- 2 tables. The join key is the same, and so a 3-way join would be performed. diff --git a/ql/src/test/results/clientpositive/skewjoinopt8.q.out b/ql/src/test/results/clientpositive/skewjoinopt8.q.out index d051e27..2f5da24 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt8.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt8.q.out @@ -1,37 +1,49 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: -- This test is for validating skewed join compile time optimization for more than -- 2 tables. The join key is the same, and so a 3-way join would be performed. diff --git a/ql/src/test/results/clientpositive/skewjoinopt9.q.out b/ql/src/test/results/clientpositive/skewjoinopt9.q.out index 3e3e2cb..62563f5 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt9.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt9.q.out @@ -1,26 +1,34 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) SKEWED BY (key) ON ((2)) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: -- no skew join compile time optimization would be performed if one of the -- join sources is a sub-query consisting of a union all diff --git a/ql/src/test/results/clientpositive/smb_mapjoin9.q.out b/ql/src/test/results/clientpositive/smb_mapjoin9.q.out index 1b6bec3..a7f3fc4 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin9.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin9.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table hive_test_smb_bucket1 (key int, value string) partitioned by (ds string) clustered by (key) sorted by (key) into 2 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_smb_bucket1 (key int, value string) partitioned by (ds string) clustered by (key) sorted by (key) into 2 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_smb_bucket1 PREHOOK: query: create table hive_test_smb_bucket2 (key int, value string) partitioned by (ds string) clustered by (key) sorted by (key) into 2 buckets PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_smb_bucket2 (key int, value string) partitioned by (ds string) clustered by (key) sorted by (key) into 2 buckets POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_smb_bucket2 PREHOOK: query: -- empty partitions (HIVE-3205) explain extended diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out index cff3b39..4487fc7 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out @@ -1,35 +1,47 @@ PREHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_1 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_2 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_3 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: explain select /*+mapjoin(a)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out index ea29bac..e530879 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out @@ -1,49 +1,59 @@ PREHOOK: query: create table tmp_smb_bucket_10(userid int, pageid int, postid int, type string) partitioned by (ds string) CLUSTERED BY (userid) SORTED BY (pageid, postid, type, userid) INTO 2 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp_smb_bucket_10(userid int, pageid int, postid int, type string) partitioned by (ds string) CLUSTERED BY (userid) SORTED BY (pageid, postid, type, userid) INTO 2 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_smb_bucket_10 PREHOOK: query: alter table tmp_smb_bucket_10 add partition (ds = '1') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tmp_smb_bucket_10 +PREHOOK: Output: default@tmp_smb_bucket_10 POSTHOOK: query: alter table tmp_smb_bucket_10 add partition (ds = '1') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tmp_smb_bucket_10 +POSTHOOK: Output: default@tmp_smb_bucket_10 POSTHOOK: Output: default@tmp_smb_bucket_10@ds=1 PREHOOK: query: alter table tmp_smb_bucket_10 add partition (ds = '2') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@tmp_smb_bucket_10 +PREHOOK: Output: default@tmp_smb_bucket_10 POSTHOOK: query: alter table tmp_smb_bucket_10 add partition (ds = '2') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@tmp_smb_bucket_10 +POSTHOOK: Output: default@tmp_smb_bucket_10 POSTHOOK: Output: default@tmp_smb_bucket_10@ds=2 PREHOOK: query: -- add dummy files to make sure that the number of files in each partition is same as number of buckets load data local inpath '../../data/files/smbbucket_1.rc' INTO TABLE tmp_smb_bucket_10 partition(ds='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmp_smb_bucket_10@ds=1 POSTHOOK: query: -- add dummy files to make sure that the number of files in each partition is same as number of buckets load data local inpath '../../data/files/smbbucket_1.rc' INTO TABLE tmp_smb_bucket_10 partition(ds='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmp_smb_bucket_10@ds=1 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' INTO TABLE tmp_smb_bucket_10 partition(ds='1') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmp_smb_bucket_10@ds=1 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' INTO TABLE tmp_smb_bucket_10 partition(ds='1') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmp_smb_bucket_10@ds=1 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' INTO TABLE tmp_smb_bucket_10 partition(ds='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmp_smb_bucket_10@ds=2 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' INTO TABLE tmp_smb_bucket_10 partition(ds='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmp_smb_bucket_10@ds=2 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' INTO TABLE tmp_smb_bucket_10 partition(ds='2') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmp_smb_bucket_10@ds=2 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' INTO TABLE tmp_smb_bucket_10 partition(ds='2') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmp_smb_bucket_10@ds=2 PREHOOK: query: explain select /*+mapjoin(a)*/ * from tmp_smb_bucket_10 a join tmp_smb_bucket_10 b diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out index 5c7a6db..861f9c6 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out @@ -3,16 +3,20 @@ PREHOOK: query: -- This test verifies that the output of a sort merge join on 2 -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that the output of a sort merge join on 2 partitions (one on each side of the join) is bucketed -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * @@ -35,9 +39,11 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchem PREHOOK: query: -- Create a bucketed table CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create a bucketed table CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out index 0ddbe16..6d54d89 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out @@ -3,16 +3,20 @@ PREHOOK: query: -- This test verifies that the output of a sort merge join on 1 -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that the output of a sort merge join on 1 big partition with multiple small partitions is bucketed and sorted -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * @@ -47,9 +51,11 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=3).value SIMPLE [(src)src.FieldSchem PREHOOK: query: -- Create a bucketed table CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create a bucketed table CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out index efc781d..5a0fc91 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out @@ -3,26 +3,34 @@ PREHOOK: query: -- This test verifies that the sort merge join optimizer works w -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that the sort merge join optimizer works when the tables are joined on columns with different names -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (value INT, key STRING) CLUSTERED BY (value) SORTED BY (value ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (value INT, key STRING) CLUSTERED BY (value) SORTED BY (value ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) CLUSTERED BY (key, value) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) CLUSTERED BY (key, value) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 PREHOOK: query: CREATE TABLE test_table4 (key INT, value STRING) CLUSTERED BY (key, value) SORTED BY (value ASC, key ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table4 (key INT, value STRING) CLUSTERED BY (key, value) SORTED BY (value ASC, key ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table4 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 SELECT * diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out index 3885532..e2cf731 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl1 PREHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl2 PREHOOK: query: insert overwrite table tbl1 select * from src where key < 10 diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out index 3392187..812b6fd 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out @@ -4,17 +4,21 @@ PREHOOK: query: -- This test verifies that the sort merge join optimizer works w -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that the sort merge join optimizer works when the tables are sorted on columns which is a superset -- of join columns -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, value ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 SELECT * @@ -253,9 +257,11 @@ POSTHOOK: Lineage: test_table2.value SIMPLE [(src)src.FieldSchema(name:value, ty PREHOOK: query: -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, key2 INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, key2 ASC, value ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, key2 INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, key2 ASC, value ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 POSTHOOK: Lineage: test_table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -263,8 +269,10 @@ POSTHOOK: Lineage: test_table2.key EXPRESSION [(src)src.FieldSchema(name:key, ty POSTHOOK: Lineage: test_table2.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE test_table2 (key INT, key2 INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, key2 ASC, value ASC) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, key2 INT, value STRING) CLUSTERED BY (key) SORTED BY (key ASC, key2 ASC, value ASC) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 POSTHOOK: Lineage: test_table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out index baef673..84390c1 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out @@ -1,14 +1,18 @@ PREHOOK: query: -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 SELECT * diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out index 24936fe..3f35221 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out @@ -1,44 +1,60 @@ PREHOOK: query: -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 PREHOOK: query: CREATE TABLE test_table4 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table4 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table4 PREHOOK: query: CREATE TABLE test_table5 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table5 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table5 PREHOOK: query: CREATE TABLE test_table6 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table6 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table6 PREHOOK: query: CREATE TABLE test_table7 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table7 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table7 PREHOOK: query: CREATE TABLE test_table8 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table8 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table8 PREHOOK: query: INSERT OVERWRITE TABLE test_table1 SELECT * FROM src WHERE key < 10 diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_18.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_18.q.out index 4bd8566..8c37752 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_18.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_18.q.out @@ -2,17 +2,21 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_19.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_19.q.out index 410c31c..4c40a46 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_19.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_19.q.out @@ -2,17 +2,21 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 16 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out index 7ad5bcf..0d44004 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out @@ -1,35 +1,47 @@ PREHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_1 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_2 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_3 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: explain select /*+mapjoin(a)*/ * from smb_bucket_1 a join smb_bucket_3 b on a.key = b.key diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out index a2bf58d..9b75cbc 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out @@ -2,17 +2,21 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key int, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key int, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key STRING, value1 STRING, value2 string) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key STRING, value1 STRING, value2 string) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * @@ -157,9 +161,11 @@ POSTHOOK: Lineage: test_table2 PARTITION(ds=1).value2 SIMPLE [(test_table1)a.Fie PREHOOK: query: CREATE TABLE test_table3 (key STRING, value1 int, value2 string) PARTITIONED BY (ds STRING) CLUSTERED BY (value1) SORTED BY (value1) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table3 (key STRING, value1 int, value2 string) PARTITIONED BY (ds STRING) CLUSTERED BY (value1) SORTED BY (value1) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table3 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_21.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_21.q.out index 4ba5a9a..1480f61 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_21.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_21.q.out @@ -2,17 +2,21 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 PARTITION (ds = '1') SELECT * @@ -93,9 +97,11 @@ POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchem PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key desc) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key desc) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -175,9 +181,11 @@ POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchem PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key, value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key, value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -257,9 +265,11 @@ POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchem PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (value) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -339,9 +349,11 @@ POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchem PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -421,9 +433,11 @@ POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchem PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 POSTHOOK: Lineage: test_table1 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out index 1c46b84..9c24b6b 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out @@ -2,17 +2,21 @@ PREHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create two bucketed and sorted tables CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 PREHOOK: query: FROM src INSERT OVERWRITE TABLE test_table1 SELECT * @@ -169,9 +173,11 @@ POSTHOOK: Lineage: test_table2.value SIMPLE [(test_table1)test_table1.FieldSchem PREHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table1 (key INT, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 POSTHOOK: Lineage: test_table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -180,9 +186,11 @@ POSTHOOK: Lineage: test_table2.value SIMPLE [(test_table1)test_table1.FieldSchem PREHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table2 (key INT, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table2 POSTHOOK: Lineage: test_table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_table1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out index d5187cf..f830cc7 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out @@ -1,35 +1,47 @@ PREHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_1 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_2 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_3 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: explain select * from (select a.key from smb_bucket_1 a join smb_bucket_2 b on (a.key = b.key) where a.key = 5) t1 left outer join (select c.key from smb_bucket_2 c join smb_bucket_3 d on (c.key = d.key) where c.key=5) t2 on (t1.key=t2.key) where t2.key=5 diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out index 29b74d9..40c1740 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out @@ -1,35 +1,47 @@ PREHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_1 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_2 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_3 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: explain select /*+mapjoin(a)*/ * from smb_bucket_2 a join smb_bucket_3 b on a.key = b.key diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_4.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_4.q.out index 18825ef..aa9961f 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_4.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_4.q.out @@ -1,35 +1,47 @@ PREHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_1 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_2 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_3 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: explain select /*+mapjoin(a,b)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_5.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_5.q.out index f6553b6..b8fbba5 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_5.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_5.q.out @@ -1,35 +1,47 @@ PREHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_1 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' overwrite into table smb_bucket_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_1 PREHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_2 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_2.rc' overwrite into table smb_bucket_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_2 PREHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_3 POSTHOOK: query: load data local inpath '../../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_3 PREHOOK: query: explain select /*+mapjoin(a,c)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out index 9ac0df1..f83539c 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out @@ -1,22 +1,30 @@ PREHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket4_1 PREHOOK: query: CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket4_2 PREHOOK: query: create table smb_join_results(k1 int, v1 string, k2 int, v2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_join_results(k1 int, v1 string, k2 int, v2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_join_results PREHOOK: query: create table normal_join_results(k1 int, v1 string, k2 int, v2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table normal_join_results(k1 int, v1 string, k2 int, v2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@normal_join_results PREHOOK: query: insert overwrite table smb_bucket4_1 select * from src diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_7.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_7.q.out index 8be4606..77ee844 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_7.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_7.q.out @@ -1,39 +1,53 @@ PREHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket4_1 PREHOOK: query: CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket4_2 PREHOOK: query: create table smb_join_results(k1 int, v1 string, k2 int, v2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_join_results(k1 int, v1 string, k2 int, v2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_join_results PREHOOK: query: create table smb_join_results_empty_bigtable(k1 int, v1 string, k2 int, v2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_join_results_empty_bigtable(k1 int, v1 string, k2 int, v2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_join_results_empty_bigtable PREHOOK: query: create table normal_join_results(k1 int, v1 string, k2 int, v2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table normal_join_results(k1 int, v1 string, k2 int, v2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@normal_join_results PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table smb_bucket4_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket4_1 POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table smb_bucket4_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket4_1 PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table smb_bucket4_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket4_1 POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table smb_bucket4_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket4_1 PREHOOK: query: insert overwrite table smb_bucket4_2 select * from src diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_8.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_8.q.out index c393aa8..46ede7c 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_8.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_8.q.out @@ -1,28 +1,38 @@ PREHOOK: query: create table smb_bucket_input (key int, value string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table smb_bucket_input (key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket_input PREHOOK: query: load data local inpath '../../data/files/smb_bucket_input.rc' into table smb_bucket_input PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@smb_bucket_input POSTHOOK: query: load data local inpath '../../data/files/smb_bucket_input.rc' into table smb_bucket_input POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@smb_bucket_input PREHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket4_1 PREHOOK: query: CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket4_2 PREHOOK: query: CREATE TABLE smb_bucket4_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE smb_bucket4_3(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@smb_bucket4_3 PREHOOK: query: insert overwrite table smb_bucket4_1 select * from smb_bucket_input where key=4 or key=2000 or key=4000 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out index d6395cc..3969b6f 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: drop table table_desc2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table table_desc1(key string, value string) clustered by (key) sorted by (key DESC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc1(key string, value string) clustered by (key) sorted by (key DESC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc1 PREHOOK: query: create table table_desc2(key string, value string) clustered by (key) sorted by (key DESC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc2(key string, value string) clustered by (key) sorted by (key DESC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc2 PREHOOK: query: insert overwrite table table_desc1 select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out index 2ca9d8a..155a78c 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out @@ -9,16 +9,20 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table table_desc1(key string, value string) clustered by (key, value) sorted by (key DESC, value DESC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc1(key string, value string) clustered by (key, value) sorted by (key DESC, value DESC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc1 PREHOOK: query: create table table_desc2(key string, value string) clustered by (key, value) sorted by (key DESC, value DESC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc2(key string, value string) clustered by (key, value) sorted by (key DESC, value DESC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc2 PREHOOK: query: insert overwrite table table_desc1 select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out index c7f8c26..b471e21 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out @@ -9,16 +9,20 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table table_desc1(key string, value string) clustered by (key, value) sorted by (key DESC, value ASC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc1(key string, value string) clustered by (key, value) sorted by (key DESC, value ASC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc1 PREHOOK: query: create table table_desc2(key string, value string) clustered by (key, value) sorted by (key DESC, value ASC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc2(key string, value string) clustered by (key, value) sorted by (key DESC, value ASC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc2 PREHOOK: query: insert overwrite table table_desc1 select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out index 3a1ed8f..c612669 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out @@ -9,16 +9,20 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table table_desc1(key string, value string) clustered by (key, value) sorted by (key DESC, value ASC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc1(key string, value string) clustered by (key, value) sorted by (key DESC, value ASC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc1 PREHOOK: query: create table table_desc2(key string, value string) clustered by (key, value) sorted by (key DESC, value DESC) into 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table table_desc2(key string, value string) clustered by (key, value) sorted by (key DESC, value DESC) into 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_desc2 PREHOOK: query: insert overwrite table table_desc1 select key, value from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out index 9d4d504..1e5aa69 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out @@ -1,9 +1,11 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: INSERT OVERWRITE TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') SELECT * FROM src PREHOOK: type: QUERY @@ -18,9 +20,11 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).value SIMPLE [(src PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 1 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 1 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out index 6ee7b0a..85b67ac 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out @@ -1,9 +1,11 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) SORTED BY (key DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: INSERT OVERWRITE TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') SELECT * FROM src PREHOOK: type: QUERY @@ -18,9 +20,11 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).value SIMPLE [(src PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) SORTED BY (value DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key) SORTED BY (value DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out index a0c869a..2c208a1 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out @@ -1,9 +1,11 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key, value) SORTED BY (key DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_1 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key, value) SORTED BY (key DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_1 PREHOOK: query: INSERT OVERWRITE TABLE srcbucket_mapjoin_part_1 PARTITION (part='1') SELECT * FROM src PREHOOK: type: QUERY @@ -40,9 +42,11 @@ POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=2).value SIMPLE [(src PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key, value) SORTED BY (value DESC) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key INT, value STRING) PARTITIONED BY (part STRING) CLUSTERED BY (key, value) SORTED BY (value DESC) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcbucket_mapjoin_part_1 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/split.q.out b/ql/src/test/results/clientpositive/split.q.out index 8bd206a..ef4720f 100644 --- a/ql/src/test/results/clientpositive/split.q.out +++ b/ql/src/test/results/clientpositive/split.q.out @@ -5,17 +5,21 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE table tmp_jo_tab_test (message_line STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE table tmp_jo_tab_test (message_line STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_jo_tab_test PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/input.txt' OVERWRITE INTO TABLE tmp_jo_tab_test PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmp_jo_tab_test POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/input.txt' OVERWRITE INTO TABLE tmp_jo_tab_test POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmp_jo_tab_test PREHOOK: query: select size(split(message_line, '\t')) from tmp_jo_tab_test PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats0.q.out b/ql/src/test/results/clientpositive/stats0.q.out index 15b270f..d951153 100644 --- a/ql/src/test/results/clientpositive/stats0.q.out +++ b/ql/src/test/results/clientpositive/stats0.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE stats_non_partitioned (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stats_non_partitioned (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_non_partitioned PREHOOK: query: explain extended insert overwrite table stats_non_partitioned @@ -677,8 +679,10 @@ POSTHOOK: Lineage: stats_non_partitioned.value SIMPLE [(src)src.FieldSchema(name 97 val_97 PREHOOK: query: CREATE TABLE stats_partitioned(key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stats_partitioned(key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_partitioned POSTHOOK: Lineage: stats_non_partitioned.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_non_partitioned.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -1331,8 +1335,10 @@ POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldS POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE stats_non_partitioned (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stats_non_partitioned (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_non_partitioned POSTHOOK: Lineage: stats_non_partitioned.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_non_partitioned.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -2180,8 +2186,10 @@ POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.Fiel 97 val_97 PREHOOK: query: CREATE TABLE stats_partitioned(key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stats_partitioned(key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_partitioned POSTHOOK: Lineage: stats_non_partitioned.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_non_partitioned.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/stats1.q.out b/ql/src/test/results/clientpositive/stats1.q.out index 690a53d..99b0e60 100644 --- a/ql/src/test/results/clientpositive/stats1.q.out +++ b/ql/src/test/results/clientpositive/stats1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tmptable(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmptable(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE tmptable @@ -208,12 +210,14 @@ PREHOOK: query: -- Load a file into a existing table -- Some other stats (numRows, rawDataSize) should be cleared load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE tmptable PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tmptable POSTHOOK: query: -- Load a file into a existing table -- Some stats (numFiles, totalSize) should be updated correctly -- Some other stats (numRows, rawDataSize) should be cleared load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE tmptable POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tmptable POSTHOOK: Lineage: tmptable.key EXPRESSION [(src1)s2.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tmptable.value EXPRESSION [(src)s1.null, (src1)s2.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/stats10.q.out b/ql/src/test/results/clientpositive/stats10.q.out index 86ad524..e23f8ca 100644 --- a/ql/src/test/results/clientpositive/stats10.q.out +++ b/ql/src/test/results/clientpositive/stats10.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE bucket3_1(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE bucket3_1(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket3_1 PREHOOK: query: explain insert overwrite table bucket3_1 partition (ds='1') diff --git a/ql/src/test/results/clientpositive/stats11.q.out b/ql/src/test/results/clientpositive/stats11.q.out index 5e65bc5..ce1197e 100644 --- a/ql/src/test/results/clientpositive/stats11.q.out +++ b/ql/src/test/results/clientpositive/stats11.q.out @@ -1,24 +1,32 @@ PREHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part PREHOOK: query: explain load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') @@ -53,9 +61,11 @@ STAGE PLANS: PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08') @@ -99,9 +109,11 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: DESCTABLE @@ -144,9 +156,11 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: DESCTABLE @@ -189,9 +203,11 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08') PREHOOK: type: DESCTABLE @@ -234,36 +250,48 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcbucket_mapjoin_part_2 PREHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: query: load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2 POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 POSTHOOK: query: load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part_2@ds=2008-04-08 PREHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_1 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_1 PREHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_hash_result_2 (key bigint , value1 bigint, value2 bigint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_hash_result_2 PREHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bucketmapjoin_tmp_result (key string , value1 string, value2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucketmapjoin_tmp_result PREHOOK: query: explain extended insert overwrite table bucketmapjoin_tmp_result diff --git a/ql/src/test/results/clientpositive/stats12.q.out b/ql/src/test/results/clientpositive/stats12.q.out index 923412e..4e0c060 100644 --- a/ql/src/test/results/clientpositive/stats12.q.out +++ b/ql/src/test/results/clientpositive/stats12.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table analyze_srcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table analyze_srcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart PREHOOK: query: insert overwrite table analyze_srcpart partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats13.q.out b/ql/src/test/results/clientpositive/stats13.q.out index bd997cb..b30c543 100644 --- a/ql/src/test/results/clientpositive/stats13.q.out +++ b/ql/src/test/results/clientpositive/stats13.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table analyze_srcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table analyze_srcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart PREHOOK: query: insert overwrite table analyze_srcpart partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY @@ -381,8 +383,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: create table analyze_srcpart2 like analyze_srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table analyze_srcpart2 like analyze_srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart2 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/stats14.q.out b/ql/src/test/results/clientpositive/stats14.q.out index 888b364..f05b8ff 100644 --- a/ql/src/test/results/clientpositive/stats14.q.out +++ b/ql/src/test/results/clientpositive/stats14.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table stats_src like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_src like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_src PREHOOK: query: insert overwrite table stats_src select * from src PREHOOK: type: QUERY @@ -61,8 +63,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: create table stats_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_part POSTHOOK: Lineage: stats_src.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_src.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/stats15.q.out b/ql/src/test/results/clientpositive/stats15.q.out index 888b364..f05b8ff 100644 --- a/ql/src/test/results/clientpositive/stats15.q.out +++ b/ql/src/test/results/clientpositive/stats15.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table stats_src like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_src like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_src PREHOOK: query: insert overwrite table stats_src select * from src PREHOOK: type: QUERY @@ -61,8 +63,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: create table stats_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_part POSTHOOK: Lineage: stats_src.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_src.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/stats16.q.out b/ql/src/test/results/clientpositive/stats16.q.out index a2d8c84..84d564c 100644 --- a/ql/src/test/results/clientpositive/stats16.q.out +++ b/ql/src/test/results/clientpositive/stats16.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table stats16 POSTHOOK: type: DROPTABLE PREHOOK: query: create table stats16 (key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats16 (key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats16 PREHOOK: query: desc formatted stats16 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/stats18.q.out b/ql/src/test/results/clientpositive/stats18.q.out index cd4ed81..a6eece4 100644 --- a/ql/src/test/results/clientpositive/stats18.q.out +++ b/ql/src/test/results/clientpositive/stats18.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table stats_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_part PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src PREHOOK: type: QUERY @@ -63,9 +65,11 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE stats_part partition (ds='2010-04-08', hr='13') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@stats_part@ds=2010-04-08/hr=13 POSTHOOK: query: load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE stats_part partition (ds='2010-04-08', hr='13') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/stats19.q.out b/ql/src/test/results/clientpositive/stats19.q.out index 18029b8..bcc639a 100644 --- a/ql/src/test/results/clientpositive/stats19.q.out +++ b/ql/src/test/results/clientpositive/stats19.q.out @@ -5,6 +5,7 @@ PREHOOK: query: -- Note, its important that the partitions created below have a create table stats_part like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Note, its important that the partitions created below have a name greater than 16 characters in -- length since KeyVerifyingStatsAggregator depends on checking that a keyPrefix is hashed by the -- length of the keyPrefix, having a partition name greather than 16 characters guarantees no false @@ -12,6 +13,7 @@ POSTHOOK: query: -- Note, its important that the partitions created below have a create table stats_part like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_part PREHOOK: query: -- The stats key should be hashed since the max length is too small insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src diff --git a/ql/src/test/results/clientpositive/stats2.q.out b/ql/src/test/results/clientpositive/stats2.q.out index 761f5f0..7e157ea 100644 --- a/ql/src/test/results/clientpositive/stats2.q.out +++ b/ql/src/test/results/clientpositive/stats2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table analyze_t1 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table analyze_t1 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_t1 PREHOOK: query: explain insert overwrite table analyze_t1 partition (ds, hr) select * from srcpart where ds is not null diff --git a/ql/src/test/results/clientpositive/stats20.q.out b/ql/src/test/results/clientpositive/stats20.q.out index c3a2d67..30db4a9 100644 --- a/ql/src/test/results/clientpositive/stats20.q.out +++ b/ql/src/test/results/clientpositive/stats20.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE stats_partitioned(key string, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stats_partitioned(key string, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_partitioned PREHOOK: query: insert overwrite table stats_partitioned partition (ds='1') select * from src diff --git a/ql/src/test/results/clientpositive/stats3.q.out b/ql/src/test/results/clientpositive/stats3.q.out index 83ca1a3..a14e449 100644 --- a/ql/src/test/results/clientpositive/stats3.q.out +++ b/ql/src/test/results/clientpositive/stats3.q.out @@ -8,8 +8,10 @@ POSTHOOK: query: drop table hive_test_dst POSTHOOK: type: DROPTABLE PREHOOK: query: create table hive_test_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_src PREHOOK: query: explain extended load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src @@ -64,9 +66,11 @@ STAGE PLANS: PREHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@hive_test_src POSTHOOK: query: load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@hive_test_src PREHOOK: query: desc formatted hive_test_src PREHOOK: type: DESCTABLE @@ -103,8 +107,10 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: create table hive_test_dst ( col1 string ) partitioned by ( pcol1 string , pcol2 string) stored as sequencefile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table hive_test_dst ( col1 string ) partitioned by ( pcol1 string , pcol2 string) stored as sequencefile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@hive_test_dst PREHOOK: query: insert overwrite table hive_test_dst partition ( pcol1='test_part', pCol2='test_Part') select col1 from hive_test_src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats4.q.out b/ql/src/test/results/clientpositive/stats4.q.out index 3e9e522..a91ce77 100644 --- a/ql/src/test/results/clientpositive/stats4.q.out +++ b/ql/src/test/results/clientpositive/stats4.q.out @@ -16,13 +16,17 @@ POSTHOOK: query: drop table nzhang_part2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table if not exists nzhang_part1 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part1 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part1 PREHOOK: query: create table if not exists nzhang_part2 like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists nzhang_part2 like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_part2 PREHOOK: query: explain from srcpart diff --git a/ql/src/test/results/clientpositive/stats6.q.out b/ql/src/test/results/clientpositive/stats6.q.out index ea6af9d..74f71ad 100644 --- a/ql/src/test/results/clientpositive/stats6.q.out +++ b/ql/src/test/results/clientpositive/stats6.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table analyze_srcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table analyze_srcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart PREHOOK: query: insert overwrite table analyze_srcpart partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats7.q.out b/ql/src/test/results/clientpositive/stats7.q.out index 81a25f4..0fbe98f 100644 --- a/ql/src/test/results/clientpositive/stats7.q.out +++ b/ql/src/test/results/clientpositive/stats7.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table analyze_srcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table analyze_srcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart PREHOOK: query: insert overwrite table analyze_srcpart partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats8.q.out b/ql/src/test/results/clientpositive/stats8.q.out index 5cd4ef5..1bd9427 100644 --- a/ql/src/test/results/clientpositive/stats8.q.out +++ b/ql/src/test/results/clientpositive/stats8.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table analyze_srcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table analyze_srcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart PREHOOK: query: insert overwrite table analyze_srcpart partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats9.q.out b/ql/src/test/results/clientpositive/stats9.q.out index 51a29ee..404d588 100644 --- a/ql/src/test/results/clientpositive/stats9.q.out +++ b/ql/src/test/results/clientpositive/stats9.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table analyze_srcbucket like srcbucket PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table analyze_srcbucket like srcbucket POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcbucket PREHOOK: query: insert overwrite table analyze_srcbucket select * from srcbucket PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out b/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out index 04190d5..f8ab1ea 100644 --- a/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out +++ b/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out @@ -6,6 +6,7 @@ PREHOOK: query: -- In this test, there is a dummy stats aggregator which throws create table tmptable(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- In this test, there is a dummy stats aggregator which throws an error when various -- methods are called (as indicated by the parameter hive.test.dummystats.aggregator) -- Since stats need not be reliable (by setting hive.stats.reliable to false), the @@ -14,6 +15,7 @@ POSTHOOK: query: -- In this test, there is a dummy stats aggregator which throws create table tmptable(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: INSERT OVERWRITE TABLE tmptable select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats_counter_partitioned.q.out b/ql/src/test/results/clientpositive/stats_counter_partitioned.q.out index 62daf36..b41b357 100644 --- a/ql/src/test/results/clientpositive/stats_counter_partitioned.q.out +++ b/ql/src/test/results/clientpositive/stats_counter_partitioned.q.out @@ -2,23 +2,29 @@ PREHOOK: query: -- partitioned table analyze create table dummy (key string, value string) partitioned by (ds string, hr string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- partitioned table analyze create table dummy (key string, value string) partitioned by (ds string, hr string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dummy PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table dummy partition (ds='2008',hr='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dummy POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table dummy partition (ds='2008',hr='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dummy POSTHOOK: Output: default@dummy@ds=2008/hr=12 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table dummy partition (ds='2008',hr='11') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dummy POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table dummy partition (ds='2008',hr='11') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dummy POSTHOOK: Output: default@dummy@ds=2008/hr=11 PREHOOK: query: analyze table dummy partition (ds,hr) compute statistics @@ -129,10 +135,12 @@ PREHOOK: query: -- static partitioned table on insert create table dummy (key string, value string) partitioned by (ds string, hr string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- static partitioned table on insert create table dummy (key string, value string) partitioned by (ds string, hr string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dummy PREHOOK: query: insert overwrite table dummy partition (ds='10',hr='11') select * from src PREHOOK: type: QUERY @@ -260,10 +268,12 @@ PREHOOK: query: -- dynamic partitioned table on insert create table dummy (key int) partitioned by (hr int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- dynamic partitioned table on insert create table dummy (key int) partitioned by (hr int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dummy POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=11).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=11).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -271,8 +281,10 @@ POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=12).key SIMPLE [(src)src.FieldSchema POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=12).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE TABLE tbl(key int, value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tbl(key int, value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tbl POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=11).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=11).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -280,9 +292,11 @@ POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=12).key SIMPLE [(src)src.FieldSchema POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=12).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/tbl.txt' OVERWRITE INTO TABLE tbl PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@tbl POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/tbl.txt' OVERWRITE INTO TABLE tbl POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@tbl POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=11).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=11).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/stats_empty_dyn_part.q.out b/ql/src/test/results/clientpositive/stats_empty_dyn_part.q.out index a5caf2e..efde851 100644 --- a/ql/src/test/results/clientpositive/stats_empty_dyn_part.q.out +++ b/ql/src/test/results/clientpositive/stats_empty_dyn_part.q.out @@ -4,12 +4,14 @@ PREHOOK: query: -- This test verifies writing a query using dynamic partitions create table tmptable(key string) partitioned by (part string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies writing a query using dynamic partitions -- which results in no partitions actually being created with -- hive.stats.reliable set to true create table tmptable(key string) partitioned by (part string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: explain insert overwrite table tmptable partition (part) select key, value from src where key = 'no_such_value' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats_empty_partition.q.out b/ql/src/test/results/clientpositive/stats_empty_partition.q.out index 470ee2e..6987f64 100644 --- a/ql/src/test/results/clientpositive/stats_empty_partition.q.out +++ b/ql/src/test/results/clientpositive/stats_empty_partition.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- This test verifies that writing an empty partition succeeds w create table tmptable(key string, value string) partitioned by (part string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This test verifies that writing an empty partition succeeds when -- hive.stats.reliable is set to true. create table tmptable(key string, value string) partitioned by (part string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: insert overwrite table tmptable partition (part = '1') select * from src where key = 'no_such_value' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats_invalidation.q.out b/ql/src/test/results/clientpositive/stats_invalidation.q.out index 667d49c..a9e5e7b 100644 --- a/ql/src/test/results/clientpositive/stats_invalidation.q.out +++ b/ql/src/test/results/clientpositive/stats_invalidation.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE stats_invalid (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stats_invalid (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_invalid PREHOOK: query: insert overwrite table stats_invalid select * from src diff --git a/ql/src/test/results/clientpositive/stats_noscan_1.q.out b/ql/src/test/results/clientpositive/stats_noscan_1.q.out index f92ded8..990acec 100644 --- a/ql/src/test/results/clientpositive/stats_noscan_1.q.out +++ b/ql/src/test/results/clientpositive/stats_noscan_1.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- test analyze table ... compute statistics noscan -- 1. test full spec create table analyze_srcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test analyze table ... compute statistics noscan -- 1. test full spec create table analyze_srcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart PREHOOK: query: insert overwrite table analyze_srcpart partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY @@ -353,9 +355,11 @@ POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [ PREHOOK: query: -- 2. test partial spec create table analyze_srcpart_partial like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- 2. test partial spec create table analyze_srcpart_partial like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart_partial POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/stats_noscan_2.q.out b/ql/src/test/results/clientpositive/stats_noscan_2.q.out index b17d456..afbc69c 100644 --- a/ql/src/test/results/clientpositive/stats_noscan_2.q.out +++ b/ql/src/test/results/clientpositive/stats_noscan_2.q.out @@ -2,10 +2,14 @@ PREHOOK: query: -- test analyze table compute statistiscs [noscan] on external t -- 1 test table #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: -- test analyze table compute statistiscs [noscan] on external table -- 1 test table #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@anaylyze_external PREHOOK: query: SELECT * FROM anaylyze_external PREHOOK: type: QUERY @@ -117,17 +121,21 @@ PREHOOK: query: -- 2 test partition -- prepare data create table texternal(key string, val string) partitioned by (insertdate string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- 2 test partition -- prepare data create table texternal(key string, val string) partitioned by (insertdate string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@texternal #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@texternal +#### A masked pattern was here #### +PREHOOK: Output: default@texternal #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@texternal +#### A masked pattern was here #### +POSTHOOK: Output: default@texternal POSTHOOK: Output: default@texternal@insertdate=2008-01-01 PREHOOK: query: from src insert overwrite table texternal partition (insertdate='2008-01-01') select * PREHOOK: type: QUERY @@ -155,18 +163,24 @@ POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).val SIMPLE [(src)s PREHOOK: query: -- create external table #### A masked pattern was here #### PREHOOK: type: CREATETABLE +#### A masked pattern was here #### +PREHOOK: Output: database:default POSTHOOK: query: -- create external table #### A masked pattern was here #### POSTHOOK: type: CREATETABLE +#### A masked pattern was here #### +POSTHOOK: Output: database:default POSTHOOK: Output: default@anaylyze_external POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).val SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@anaylyze_external +#### A masked pattern was here #### +PREHOOK: Output: default@anaylyze_external #### A masked pattern was here #### POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@anaylyze_external +#### A masked pattern was here #### +POSTHOOK: Output: default@anaylyze_external POSTHOOK: Output: default@anaylyze_external@insertdate=2008-01-01 POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).val SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/stats_only_null.q.out b/ql/src/test/results/clientpositive/stats_only_null.q.out index 1023f5e..5400023 100644 --- a/ql/src/test/results/clientpositive/stats_only_null.q.out +++ b/ql/src/test/results/clientpositive/stats_only_null.q.out @@ -1,23 +1,31 @@ PREHOOK: query: CREATE TABLE temps_null(a double, b int, c STRING, d smallint) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE temps_null(a double, b int, c STRING, d smallint) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@temps_null PREHOOK: query: CREATE TABLE stats_null(a double, b int, c STRING, d smallint) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stats_null(a double, b int, c STRING, d smallint) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_null PREHOOK: query: CREATE TABLE stats_null_part(a double, b int, c STRING, d smallint) partitioned by (dt string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE stats_null_part(a double, b int, c STRING, d smallint) partitioned by (dt string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_null_part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE temps_null PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@temps_null POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/null.txt' INTO TABLE temps_null POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@temps_null PREHOOK: query: insert overwrite table stats_null select * from temps_null PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats_partscan_1.q.out b/ql/src/test/results/clientpositive/stats_partscan_1.q.out index b3cfb61..7cc6e97 100644 --- a/ql/src/test/results/clientpositive/stats_partscan_1.q.out +++ b/ql/src/test/results/clientpositive/stats_partscan_1.q.out @@ -10,6 +10,7 @@ CREATE table analyze_srcpart_partial_scan (key STRING, value STRING) partitioned by (ds string, hr string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20,0.20S) -- This test uses mapred.max.split.size/mapred.max.split.size for controlling -- number of input splits, which is not effective in hive 0.20. @@ -22,6 +23,7 @@ CREATE table analyze_srcpart_partial_scan (key STRING, value STRING) partitioned by (ds string, hr string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart_partial_scan PREHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/stats_publisher_error_1.q.out b/ql/src/test/results/clientpositive/stats_publisher_error_1.q.out index 9c0aec6..fa75cd1 100644 --- a/ql/src/test/results/clientpositive/stats_publisher_error_1.q.out +++ b/ql/src/test/results/clientpositive/stats_publisher_error_1.q.out @@ -6,6 +6,7 @@ PREHOOK: query: -- In this test, there is a dummy stats publisher which throws a create table tmptable(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- In this test, there is a dummy stats publisher which throws an error when various -- methods are called (as indicated by the parameter hive.test.dummystats.publisher) -- Since stats need not be reliable (by setting hive.stats.reliable to false), the @@ -14,6 +15,7 @@ POSTHOOK: query: -- In this test, there is a dummy stats publisher which throws create table tmptable(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: INSERT OVERWRITE TABLE tmptable select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/subquery_in.q.out b/ql/src/test/results/clientpositive/subquery_in.q.out index 48be22b..fe67a17 100644 --- a/ql/src/test/results/clientpositive/subquery_in.q.out +++ b/ql/src/test/results/clientpositive/subquery_in.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: DROP TABLE lineitem PREHOOK: type: DROPTABLE @@ -58,6 +62,7 @@ PREHOOK: query: CREATE TABLE lineitem (L_ORDERKEY INT, ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE lineitem (L_ORDERKEY INT, L_PARTKEY INT, L_SUPPKEY INT, @@ -77,12 +82,15 @@ POSTHOOK: query: CREATE TABLE lineitem (L_ORDERKEY INT, ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@lineitem PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@lineitem POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@lineitem PREHOOK: query: -- non agg, non corr explain diff --git a/ql/src/test/results/clientpositive/subquery_in_having.q.out b/ql/src/test/results/clientpositive/subquery_in_having.q.out index ef3dc18..2bae726 100644 --- a/ql/src/test/results/clientpositive/subquery_in_having.q.out +++ b/ql/src/test/results/clientpositive/subquery_in_having.q.out @@ -11,6 +11,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -24,12 +25,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: -- non agg, non corr explain diff --git a/ql/src/test/results/clientpositive/subquery_multiinsert.q.out b/ql/src/test/results/clientpositive/subquery_multiinsert.q.out index fdafea3..75e6b58 100644 --- a/ql/src/test/results/clientpositive/subquery_multiinsert.q.out +++ b/ql/src/test/results/clientpositive/subquery_multiinsert.q.out @@ -3,22 +3,26 @@ PREHOOK: query: CREATE TABLE src_4( value STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_4( key STRING, value STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_4 PREHOOK: query: CREATE TABLE src_5( key STRING, value STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_5( key STRING, value STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_5 PREHOOK: query: explain from src b diff --git a/ql/src/test/results/clientpositive/subquery_notin.q.out b/ql/src/test/results/clientpositive/subquery_notin.q.out index b2d687b..8f05df8 100644 --- a/ql/src/test/results/clientpositive/subquery_notin.q.out +++ b/ql/src/test/results/clientpositive/subquery_notin.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: DROP TABLE lineitem PREHOOK: type: DROPTABLE @@ -58,6 +62,7 @@ PREHOOK: query: CREATE TABLE lineitem (L_ORDERKEY INT, ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE lineitem (L_ORDERKEY INT, L_PARTKEY INT, L_SUPPKEY INT, @@ -77,12 +82,15 @@ POSTHOOK: query: CREATE TABLE lineitem (L_ORDERKEY INT, ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@lineitem PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@lineitem POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@lineitem PREHOOK: query: -- non agg, non corr explain diff --git a/ql/src/test/results/clientpositive/subquery_notin_having.q.out b/ql/src/test/results/clientpositive/subquery_notin_having.q.out index 5f4d96e..d1cd738 100644 --- a/ql/src/test/results/clientpositive/subquery_notin_having.q.out +++ b/ql/src/test/results/clientpositive/subquery_notin_having.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: -- non agg, non corr explain diff --git a/ql/src/test/results/clientpositive/symlink_text_input_format.q.out b/ql/src/test/results/clientpositive/symlink_text_input_format.q.out index c33c863..7035a35 100644 --- a/ql/src/test/results/clientpositive/symlink_text_input_format.q.out +++ b/ql/src/test/results/clientpositive/symlink_text_input_format.q.out @@ -22,8 +22,10 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE symlink_text_input_format (key STRING, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE symlink_text_input_format (key STRING, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@symlink_text_input_format PREHOOK: query: EXPLAIN SELECT * FROM symlink_text_input_format order by key, value PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/table_access_keys_stats.q.out b/ql/src/test/results/clientpositive/table_access_keys_stats.q.out index 0521251..165554f 100644 --- a/ql/src/test/results/clientpositive/table_access_keys_stats.q.out +++ b/ql/src/test/results/clientpositive/table_access_keys_stats.q.out @@ -2,13 +2,17 @@ PREHOOK: query: -- This test is used for testing the TableAccessAnalyzer CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default PREHOOK: query: -- Simple group-by queries SELECT key, count(1) FROM T1 GROUP BY key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/tablename_with_select.q.out b/ql/src/test/results/clientpositive/tablename_with_select.q.out index 89b37a9..81d696a 100644 --- a/ql/src/test/results/clientpositive/tablename_with_select.q.out +++ b/ql/src/test/results/clientpositive/tablename_with_select.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE tmp_select(a INT, b STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE tmp_select(a INT, b STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_select PREHOOK: query: DESCRIBE tmp_select PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/test_boolean_whereclause.q.out b/ql/src/test/results/clientpositive/test_boolean_whereclause.q.out index 9bb9446..467526c 100644 --- a/ql/src/test/results/clientpositive/test_boolean_whereclause.q.out +++ b/ql/src/test/results/clientpositive/test_boolean_whereclause.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table if not exists test_boolean(dummy tinyint) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table if not exists test_boolean(dummy tinyint) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_boolean PREHOOK: query: insert overwrite table test_boolean select 1 from src tablesample (1 rows) PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/timestamp_1.q.out b/ql/src/test/results/clientpositive/timestamp_1.q.out index 3768ec2..d9313b4 100644 --- a/ql/src/test/results/clientpositive/timestamp_1.q.out +++ b/ql/src/test/results/clientpositive/timestamp_1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table timestamp_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table timestamp_1 (t timestamp) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table timestamp_1 (t timestamp) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@timestamp_1 PREHOOK: query: alter table timestamp_1 set serde 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/timestamp_2.q.out b/ql/src/test/results/clientpositive/timestamp_2.q.out index 8648b87..2060af4 100644 --- a/ql/src/test/results/clientpositive/timestamp_2.q.out +++ b/ql/src/test/results/clientpositive/timestamp_2.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table timestamp_2 POSTHOOK: type: DROPTABLE PREHOOK: query: create table timestamp_2 (t timestamp) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table timestamp_2 (t timestamp) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@timestamp_2 PREHOOK: query: alter table timestamp_2 set serde 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/timestamp_3.q.out b/ql/src/test/results/clientpositive/timestamp_3.q.out index 7eaf5cb..2e2a9a9 100644 --- a/ql/src/test/results/clientpositive/timestamp_3.q.out +++ b/ql/src/test/results/clientpositive/timestamp_3.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table timestamp_3 POSTHOOK: type: DROPTABLE PREHOOK: query: create table timestamp_3 (t timestamp) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table timestamp_3 (t timestamp) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@timestamp_3 PREHOOK: query: alter table timestamp_3 set serde 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' PREHOOK: type: ALTERTABLE_SERIALIZER diff --git a/ql/src/test/results/clientpositive/timestamp_lazy.q.out b/ql/src/test/results/clientpositive/timestamp_lazy.q.out index 62a5ab7..d7619af 100644 --- a/ql/src/test/results/clientpositive/timestamp_lazy.q.out +++ b/ql/src/test/results/clientpositive/timestamp_lazy.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table timestamp_lazy POSTHOOK: type: DROPTABLE PREHOOK: query: create table timestamp_lazy (t timestamp, key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table timestamp_lazy (t timestamp, key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@timestamp_lazy PREHOOK: query: insert overwrite table timestamp_lazy select cast('2011-01-01 01:01:01' as timestamp), key, value from src tablesample (5 rows) PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/timestamp_null.q.out b/ql/src/test/results/clientpositive/timestamp_null.q.out index 57269d7..0110d80 100644 --- a/ql/src/test/results/clientpositive/timestamp_null.q.out +++ b/ql/src/test/results/clientpositive/timestamp_null.q.out @@ -4,14 +4,18 @@ POSTHOOK: query: DROP TABLE IF EXISTS timestamp_null POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE timestamp_null (t1 TIMESTAMP) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE timestamp_null (t1 TIMESTAMP) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@timestamp_null PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/test.dat' OVERWRITE INTO TABLE timestamp_null PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@timestamp_null POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/test.dat' OVERWRITE INTO TABLE timestamp_null POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@timestamp_null PREHOOK: query: SELECT * FROM timestamp_null LIMIT 1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/timestamp_udf.q.out b/ql/src/test/results/clientpositive/timestamp_udf.q.out index 8d16c48..6dd0ae7 100644 --- a/ql/src/test/results/clientpositive/timestamp_udf.q.out +++ b/ql/src/test/results/clientpositive/timestamp_udf.q.out @@ -8,13 +8,17 @@ POSTHOOK: query: drop table timestamp_udf_string POSTHOOK: type: DROPTABLE PREHOOK: query: create table timestamp_udf (t timestamp) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table timestamp_udf (t timestamp) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@timestamp_udf PREHOOK: query: create table timestamp_udf_string (t string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table timestamp_udf_string (t string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@timestamp_udf_string PREHOOK: query: from (select * from src tablesample (1 rows)) s insert overwrite table timestamp_udf diff --git a/ql/src/test/results/clientpositive/touch.q.out b/ql/src/test/results/clientpositive/touch.q.out index 604f76c..1bbc267 100644 --- a/ql/src/test/results/clientpositive/touch.q.out +++ b/ql/src/test/results/clientpositive/touch.q.out @@ -8,8 +8,10 @@ POSTHOOK: query: drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrc PREHOOK: query: insert overwrite table tstsrc select key, value from src PREHOOK: type: QUERY @@ -23,8 +25,10 @@ POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart POSTHOOK: Lineage: tstsrc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/transform1.q.out b/ql/src/test/results/clientpositive/transform1.q.out index 7ce3b85..f196221 100644 --- a/ql/src/test/results/clientpositive/transform1.q.out +++ b/ql/src/test/results/clientpositive/transform1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table transform1_t1(a string, b string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table transform1_t1(a string, b string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@transform1_t1 PREHOOK: query: EXPLAIN SELECT transform(*) USING 'cat' AS (col array) FROM transform1_t1 @@ -53,8 +55,10 @@ POSTHOOK: Input: default@transform1_t1 #### A masked pattern was here #### PREHOOK: query: create table transform1_t2(col array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table transform1_t2(col array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@transform1_t2 PREHOOK: query: insert overwrite table transform1_t2 select array(1,2,3) from src tablesample (1 rows) diff --git a/ql/src/test/results/clientpositive/truncate_column.q.out b/ql/src/test/results/clientpositive/truncate_column.q.out index 82f4988..a352aa0 100644 --- a/ql/src/test/results/clientpositive/truncate_column.q.out +++ b/ql/src/test/results/clientpositive/truncate_column.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- Tests truncating column(s) from a table, also tests that stat CREATE TABLE test_tab (key STRING, value STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests truncating column(s) from a table, also tests that stats are updated CREATE TABLE test_tab (key STRING, value STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: INSERT OVERWRITE TABLE test_tab SELECT * FROM src tablesample (10 rows) PREHOOK: type: QUERY @@ -571,9 +573,11 @@ NULL NULL PREHOOK: query: -- Test truncating a partition CREATE TABLE test_tab_part (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test truncating a partition CREATE TABLE test_tab_part (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab_part POSTHOOK: Lineage: test_tab.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: test_tab.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/truncate_column_buckets.q.out b/ql/src/test/results/clientpositive/truncate_column_buckets.q.out index 7f73bb1..2d4d179 100644 --- a/ql/src/test/results/clientpositive/truncate_column_buckets.q.out +++ b/ql/src/test/results/clientpositive/truncate_column_buckets.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Tests truncating columns from a bucketed table, table should CREATE TABLE test_tab (key STRING, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests truncating columns from a bucketed table, table should remain bucketed CREATE TABLE test_tab (key STRING, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: INSERT OVERWRITE TABLE test_tab SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/truncate_column_merge.q.out b/ql/src/test/results/clientpositive/truncate_column_merge.q.out index a0a7e99..57eff7e 100644 --- a/ql/src/test/results/clientpositive/truncate_column_merge.q.out +++ b/ql/src/test/results/clientpositive/truncate_column_merge.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Tests truncating a column from a table with multiple files, t CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Tests truncating a column from a table with multiple files, then merging those files CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_tab PREHOOK: query: INSERT OVERWRITE TABLE test_tab SELECT * FROM src tablesample (5 rows) PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/truncate_table.q.out b/ql/src/test/results/clientpositive/truncate_table.q.out index 673cf3b..718895c 100644 --- a/ql/src/test/results/clientpositive/truncate_table.q.out +++ b/ql/src/test/results/clientpositive/truncate_table.q.out @@ -1,70 +1,84 @@ PREHOOK: query: create table src_truncate (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src_truncate (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_truncate PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table src_truncate PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@src_truncate POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table src_truncate POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@src_truncate PREHOOK: query: create table srcpart_truncate (key string, value string) partitioned by (ds string, hr string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table srcpart_truncate (key string, value string) partitioned by (ds string, hr string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@srcpart_truncate PREHOOK: query: alter table srcpart_truncate add partition (ds='2008-04-08', hr='11') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@srcpart_truncate +PREHOOK: Output: default@srcpart_truncate POSTHOOK: query: alter table srcpart_truncate add partition (ds='2008-04-08', hr='11') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@srcpart_truncate +POSTHOOK: Output: default@srcpart_truncate POSTHOOK: Output: default@srcpart_truncate@ds=2008-04-08/hr=11 PREHOOK: query: alter table srcpart_truncate add partition (ds='2008-04-08', hr='12') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@srcpart_truncate +PREHOOK: Output: default@srcpart_truncate POSTHOOK: query: alter table srcpart_truncate add partition (ds='2008-04-08', hr='12') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@srcpart_truncate +POSTHOOK: Output: default@srcpart_truncate POSTHOOK: Output: default@srcpart_truncate@ds=2008-04-08/hr=12 PREHOOK: query: alter table srcpart_truncate add partition (ds='2008-04-09', hr='11') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@srcpart_truncate +PREHOOK: Output: default@srcpart_truncate POSTHOOK: query: alter table srcpart_truncate add partition (ds='2008-04-09', hr='11') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@srcpart_truncate +POSTHOOK: Output: default@srcpart_truncate POSTHOOK: Output: default@srcpart_truncate@ds=2008-04-09/hr=11 PREHOOK: query: alter table srcpart_truncate add partition (ds='2008-04-09', hr='12') PREHOOK: type: ALTERTABLE_ADDPARTS -PREHOOK: Input: default@srcpart_truncate +PREHOOK: Output: default@srcpart_truncate POSTHOOK: query: alter table srcpart_truncate add partition (ds='2008-04-09', hr='12') POSTHOOK: type: ALTERTABLE_ADDPARTS -POSTHOOK: Input: default@srcpart_truncate +POSTHOOK: Output: default@srcpart_truncate POSTHOOK: Output: default@srcpart_truncate@ds=2008-04-09/hr=12 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-08', hr='11') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_truncate@ds=2008-04-08/hr=11 POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-08', hr='11') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_truncate@ds=2008-04-08/hr=11 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-08', hr='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_truncate@ds=2008-04-08/hr=12 POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-08', hr='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_truncate@ds=2008-04-08/hr=12 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-09', hr='11') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_truncate@ds=2008-04-09/hr=11 POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-09', hr='11') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_truncate@ds=2008-04-09/hr=11 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-09', hr='12') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@srcpart_truncate@ds=2008-04-09/hr=12 POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-09', hr='12') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@srcpart_truncate@ds=2008-04-09/hr=12 PREHOOK: query: -- truncate non-partitioned table explain TRUNCATE TABLE src_truncate diff --git a/ql/src/test/results/clientpositive/udaf_context_ngrams.q.out b/ql/src/test/results/clientpositive/udaf_context_ngrams.q.out index 3ee8509..32e9219 100644 --- a/ql/src/test/results/clientpositive/udaf_context_ngrams.q.out +++ b/ql/src/test/results/clientpositive/udaf_context_ngrams.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE kafka (contents STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE kafka (contents STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@kafka PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/text-en.txt' INTO TABLE kafka PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@kafka POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/text-en.txt' INTO TABLE kafka POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@kafka PREHOOK: query: SELECT context_ngrams(sentences(lower(contents)), array(null), 100, 1000).estfrequency FROM kafka PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udaf_corr.q.out b/ql/src/test/results/clientpositive/udaf_corr.q.out index 5a73f2b..0103da3 100644 --- a/ql/src/test/results/clientpositive/udaf_corr.q.out +++ b/ql/src/test/results/clientpositive/udaf_corr.q.out @@ -6,18 +6,22 @@ PREHOOK: query: CREATE TABLE covar_tab (a INT, b INT, c INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE covar_tab (a INT, b INT, c INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@covar_tab PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/covar_tab.txt' OVERWRITE INTO TABLE covar_tab PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@covar_tab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/covar_tab.txt' OVERWRITE INTO TABLE covar_tab POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@covar_tab PREHOOK: query: DESCRIBE FUNCTION corr PREHOOK: type: DESCFUNCTION diff --git a/ql/src/test/results/clientpositive/udaf_covar_pop.q.out b/ql/src/test/results/clientpositive/udaf_covar_pop.q.out index 9b1f9ca..e7a71b3 100644 --- a/ql/src/test/results/clientpositive/udaf_covar_pop.q.out +++ b/ql/src/test/results/clientpositive/udaf_covar_pop.q.out @@ -6,18 +6,22 @@ PREHOOK: query: CREATE TABLE covar_tab (a INT, b INT, c INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE covar_tab (a INT, b INT, c INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@covar_tab PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/covar_tab.txt' OVERWRITE INTO TABLE covar_tab PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@covar_tab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/covar_tab.txt' OVERWRITE INTO TABLE covar_tab POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@covar_tab PREHOOK: query: DESCRIBE FUNCTION covar_pop PREHOOK: type: DESCFUNCTION diff --git a/ql/src/test/results/clientpositive/udaf_covar_samp.q.out b/ql/src/test/results/clientpositive/udaf_covar_samp.q.out index f053289..1044a00 100644 --- a/ql/src/test/results/clientpositive/udaf_covar_samp.q.out +++ b/ql/src/test/results/clientpositive/udaf_covar_samp.q.out @@ -6,18 +6,22 @@ PREHOOK: query: CREATE TABLE covar_tab (a INT, b INT, c INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE covar_tab (a INT, b INT, c INT) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@covar_tab PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/covar_tab.txt' OVERWRITE INTO TABLE covar_tab PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@covar_tab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/covar_tab.txt' OVERWRITE INTO TABLE covar_tab POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@covar_tab PREHOOK: query: DESCRIBE FUNCTION covar_samp PREHOOK: type: DESCFUNCTION diff --git a/ql/src/test/results/clientpositive/udaf_ngrams.q.out b/ql/src/test/results/clientpositive/udaf_ngrams.q.out index 238a2e1..43444e5 100644 --- a/ql/src/test/results/clientpositive/udaf_ngrams.q.out +++ b/ql/src/test/results/clientpositive/udaf_ngrams.q.out @@ -1,13 +1,17 @@ PREHOOK: query: CREATE TABLE kafka (contents STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE kafka (contents STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@kafka PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/text-en.txt' INTO TABLE kafka PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@kafka POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/text-en.txt' INTO TABLE kafka POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@kafka PREHOOK: query: SELECT ngrams(sentences(lower(contents)), 1, 100, 1000).estfrequency FROM kafka PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udaf_percentile_approx_20.q.out b/ql/src/test/results/clientpositive/udaf_percentile_approx_20.q.out index 0d14e5e..ccb00a9 100644 --- a/ql/src/test/results/clientpositive/udaf_percentile_approx_20.q.out +++ b/ql/src/test/results/clientpositive/udaf_percentile_approx_20.q.out @@ -2,94 +2,128 @@ PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE bucket (key double, value string) CLUSTERED BY (key) SORTED BY (key DESC) INTO 4 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE bucket (key double, value string) CLUSTERED BY (key) SORTED BY (key DESC) INTO 4 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket PREHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket1outof4.txt' INTO TABLE bucket POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket PREHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket2outof4.txt' INTO TABLE bucket POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket PREHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket3outof4.txt' INTO TABLE bucket POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket PREHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@bucket POSTHOOK: query: load data local inpath '../../data/files/srcsortbucket4outof4.txt' INTO TABLE bucket POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@bucket PREHOOK: query: create table t1 (result double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t1 (result double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create table t2 (result double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t2 (result double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t2 PREHOOK: query: create table t3 (result double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t3 (result double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t3 PREHOOK: query: create table t4 (result double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t4 (result double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t4 PREHOOK: query: create table t5 (result double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t5 (result double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t5 PREHOOK: query: create table t6 (result double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t6 (result double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t6 PREHOOK: query: create table t7 (result array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t7 (result array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t7 PREHOOK: query: create table t8 (result array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t8 (result array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t8 PREHOOK: query: create table t9 (result array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t9 (result array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t9 PREHOOK: query: create table t10 (result array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t10 (result array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t10 PREHOOK: query: create table t11 (result array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t11 (result array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t11 PREHOOK: query: create table t12 (result array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t12 (result array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t12 PREHOOK: query: -- disable map-side aggregation FROM bucket diff --git a/ql/src/test/results/clientpositive/udf1.q.out b/ql/src/test/results/clientpositive/udf1.q.out index 89014b6..0cd0222 100644 --- a/ql/src/test/results/clientpositive/udf1.q.out +++ b/ql/src/test/results/clientpositive/udf1.q.out @@ -4,12 +4,14 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, c14 STRING, c15 STRING, c16 STRING, c17 STRING, c18 STRING, c19 STRING, c20 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 STRING, c6 STRING, c7 STRING, c8 STRING, c9 STRING, c10 STRING, c11 STRING, c12 STRING, c13 STRING, c14 STRING, c15 STRING, c16 STRING, c17 STRING, c18 STRING, c19 STRING, c20 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT 'a' LIKE '%a%', 'b' LIKE '%a%', 'ab' LIKE '%a%', 'ab' LIKE '%a_', diff --git a/ql/src/test/results/clientpositive/udf2.q.out b/ql/src/test/results/clientpositive/udf2.q.out index ca7ba74..6228833 100644 --- a/ql/src/test/results/clientpositive/udf2.q.out +++ b/ql/src/test/results/clientpositive/udf2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT ' abc ' WHERE src.key = 86 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udf3.q.out b/ql/src/test/results/clientpositive/udf3.q.out index 546f949..ec1c7d6 100644 --- a/ql/src/test/results/clientpositive/udf3.q.out +++ b/ql/src/test/results/clientpositive/udf3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src INSERT OVERWRITE TABLE dest1 SELECT count(CAST('' AS INT)), sum(CAST('' AS INT)), avg(CAST('' AS INT)), diff --git a/ql/src/test/results/clientpositive/udf4.q.out b/ql/src/test/results/clientpositive/udf4.q.out index 99c4591..6aa4007 100644 --- a/ql/src/test/results/clientpositive/udf4.q.out +++ b/ql/src/test/results/clientpositive/udf4.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT ' abc ' WHERE src.key = 86 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udf5.q.out b/ql/src/test/results/clientpositive/udf5.q.out index 1acd4f1..800c63d 100644 --- a/ql/src/test/results/clientpositive/udf5.q.out +++ b/ql/src/test/results/clientpositive/udf5.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT ' abc ' WHERE src.key = 86 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udf6.q.out b/ql/src/test/results/clientpositive/udf6.q.out index 4cf11d0..2101219 100644 --- a/ql/src/test/results/clientpositive/udf6.q.out +++ b/ql/src/test/results/clientpositive/udf6.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT ' abc ' WHERE src.key = 86 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udf7.q.out b/ql/src/test/results/clientpositive/udf7.q.out index f58aed9..b9046e7 100644 --- a/ql/src/test/results/clientpositive/udf7.q.out +++ b/ql/src/test/results/clientpositive/udf7.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT ' abc ' WHERE src.key = 86 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udf8.q.out b/ql/src/test/results/clientpositive/udf8.q.out index 79c3bff..4fa2856 100644 --- a/ql/src/test/results/clientpositive/udf8.q.out +++ b/ql/src/test/results/clientpositive/udf8.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT '' WHERE src.key = 86 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udf_10_trims.q.out b/ql/src/test/results/clientpositive/udf_10_trims.q.out index 04d0d4f..82e4328 100644 --- a/ql/src/test/results/clientpositive/udf_10_trims.q.out +++ b/ql/src/test/results/clientpositive/udf_10_trims.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE dest1 diff --git a/ql/src/test/results/clientpositive/udf_bitmap_and.q.out b/ql/src/test/results/clientpositive/udf_bitmap_and.q.out index 01f4840..82b0d1f 100644 --- a/ql/src/test/results/clientpositive/udf_bitmap_and.q.out +++ b/ql/src/test/results/clientpositive/udf_bitmap_and.q.out @@ -22,8 +22,10 @@ POSTHOOK: query: drop table bitmap_test POSTHOOK: type: DROPTABLE PREHOOK: query: create table bitmap_test (a array, b array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bitmap_test (a array, b array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bitmap_test PREHOOK: query: insert overwrite table bitmap_test select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src tablesample (10 rows) diff --git a/ql/src/test/results/clientpositive/udf_bitmap_or.q.out b/ql/src/test/results/clientpositive/udf_bitmap_or.q.out index 9f06f6b..47c1e3d 100644 --- a/ql/src/test/results/clientpositive/udf_bitmap_or.q.out +++ b/ql/src/test/results/clientpositive/udf_bitmap_or.q.out @@ -22,8 +22,10 @@ POSTHOOK: query: drop table bitmap_test POSTHOOK: type: DROPTABLE PREHOOK: query: create table bitmap_test (a array, b array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table bitmap_test (a array, b array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@bitmap_test PREHOOK: query: insert overwrite table bitmap_test select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src tablesample (10 rows) diff --git a/ql/src/test/results/clientpositive/udf_concat_insert1.q.out b/ql/src/test/results/clientpositive/udf_concat_insert1.q.out index 9311884..69cd4ea 100644 --- a/ql/src/test/results/clientpositive/udf_concat_insert1.q.out +++ b/ql/src/test/results/clientpositive/udf_concat_insert1.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT '1234', concat(src.key) WHERE src.key < 100 group by src.key diff --git a/ql/src/test/results/clientpositive/udf_concat_insert2.q.out b/ql/src/test/results/clientpositive/udf_concat_insert2.q.out index e27e252..72a9886 100644 --- a/ql/src/test/results/clientpositive/udf_concat_insert2.q.out +++ b/ql/src/test/results/clientpositive/udf_concat_insert2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT concat('1234', 'abc', 'extra argument'), src.value WHERE src.key < 100 diff --git a/ql/src/test/results/clientpositive/udf_concat_ws.q.out b/ql/src/test/results/clientpositive/udf_concat_ws.q.out index adc6aaf..926dae2 100644 --- a/ql/src/test/results/clientpositive/udf_concat_ws.q.out +++ b/ql/src/test/results/clientpositive/udf_concat_ws.q.out @@ -13,8 +13,10 @@ Example: 'www.facebook.com' PREHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT 'abc', 'xyz', '8675309' WHERE src.key = 86 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udf_explode.q.out b/ql/src/test/results/clientpositive/udf_explode.q.out index f7b6f2a..6fc4975 100644 --- a/ql/src/test/results/clientpositive/udf_explode.q.out +++ b/ql/src/test/results/clientpositive/udf_explode.q.out @@ -682,8 +682,10 @@ POSTHOOK: query: drop table lazy_array_map POSTHOOK: type: DROPTABLE PREHOOK: query: create table lazy_array_map (map_col map, array_col array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table lazy_array_map (map_col map, array_col array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@lazy_array_map PREHOOK: query: INSERT OVERWRITE TABLE lazy_array_map select map(1,'one',2,'two',3,'three'), array('100','200','300') FROM src tablesample (1 rows) PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udf_field.q.out b/ql/src/test/results/clientpositive/udf_field.q.out index 210976d..4fc4595 100644 --- a/ql/src/test/results/clientpositive/udf_field.q.out +++ b/ql/src/test/results/clientpositive/udf_field.q.out @@ -70,14 +70,18 @@ POSTHOOK: Input: default@src 1 2 3 4 4 PREHOOK: query: CREATE TABLE test_table(col1 STRING, col2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table(col1 STRING, col2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE test_table PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test_table POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE test_table POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test_table PREHOOK: query: select col1,col2, field("66",col1), @@ -113,14 +117,18 @@ POSTHOOK: Input: default@test_table 66 val_66 1 1 0 0 0 1 0 0 2 2 PREHOOK: query: CREATE TABLE test_table1(col1 int, col2 string) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE test_table1(col1 int, col2 string) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_table1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE test_table1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@test_table1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE test_table1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@test_table1 PREHOOK: query: select col1,col2, field(66,col1), diff --git a/ql/src/test/results/clientpositive/udf_get_json_object.q.out b/ql/src/test/results/clientpositive/udf_get_json_object.q.out index d9764f5..675a630 100644 --- a/ql/src/test/results/clientpositive/udf_get_json_object.q.out +++ b/ql/src/test/results/clientpositive/udf_get_json_object.q.out @@ -25,8 +25,10 @@ Syntax not supported that's worth noticing: PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT ' abc ' WHERE src.key = 86 PREHOOK: type: QUERY @@ -163,10 +165,12 @@ PREHOOK: query: -- Verify that get_json_object can handle new lines in JSON valu CREATE TABLE dest2(c1 STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Verify that get_json_object can handle new lines in JSON values CREATE TABLE dest2(c1 STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 POSTHOOK: Lineage: dest1.c1 SIMPLE [] PREHOOK: query: INSERT OVERWRITE TABLE dest2 SELECT '{"a":"b\nc"}' FROM src tablesample (1 rows) diff --git a/ql/src/test/results/clientpositive/udf_length.q.out b/ql/src/test/results/clientpositive/udf_length.q.out index 5a695c2..a64ff17 100644 --- a/ql/src/test/results/clientpositive/udf_length.q.out +++ b/ql/src/test/results/clientpositive/udf_length.q.out @@ -13,8 +13,10 @@ Example: 8 PREHOOK: query: CREATE TABLE dest1(len INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(len INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src1 INSERT OVERWRITE TABLE dest1 SELECT length(src1.value) PREHOOK: type: QUERY @@ -157,16 +159,20 @@ POSTHOOK: Lineage: dest1.len EXPRESSION [(src1)src1.FieldSchema(name:value, type PREHOOK: query: -- Test with non-ascii characters. CREATE TABLE dest1(name STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test with non-ascii characters. CREATE TABLE dest1(name STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.len EXPRESSION [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv4.txt' INTO TABLE dest1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dest1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv4.txt' INTO TABLE dest1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.len EXPRESSION [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: EXPLAIN SELECT length(dest1.name) FROM dest1 diff --git a/ql/src/test/results/clientpositive/udf_printf.q.out b/ql/src/test/results/clientpositive/udf_printf.q.out index 38e8868..416aed9 100644 --- a/ql/src/test/results/clientpositive/udf_printf.q.out +++ b/ql/src/test/results/clientpositive/udf_printf.q.out @@ -78,9 +78,11 @@ Color red, String Null: null, number1 123456, number2 00089, Integer Null: null, PREHOOK: query: -- Test Timestamp create table timestamp_udf (t timestamp) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test Timestamp create table timestamp_udf (t timestamp) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@timestamp_udf PREHOOK: query: from (select * from src tablesample (1 rows)) s insert overwrite table timestamp_udf @@ -120,25 +122,31 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY '9' STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test Binary CREATE TABLE binay_udf(key binary, value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '9' STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@binay_udf POSTHOOK: Lineage: timestamp_udf.t EXPRESSION [] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/string.txt' INTO TABLE binay_udf PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@binay_udf POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/string.txt' INTO TABLE binay_udf POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@binay_udf POSTHOOK: Lineage: timestamp_udf.t EXPRESSION [] PREHOOK: query: create table dest1 (key binary, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dest1 (key binary, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: timestamp_udf.t EXPRESSION [] PREHOOK: query: insert overwrite table dest1 select transform(*) using 'cat' as key binary, value int from binay_udf diff --git a/ql/src/test/results/clientpositive/udf_reverse.q.out b/ql/src/test/results/clientpositive/udf_reverse.q.out index 4ca3f68..112722e 100644 --- a/ql/src/test/results/clientpositive/udf_reverse.q.out +++ b/ql/src/test/results/clientpositive/udf_reverse.q.out @@ -13,8 +13,10 @@ Example: 'koobecaF' PREHOOK: query: CREATE TABLE dest1(len STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE dest1(len STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: EXPLAIN FROM src1 INSERT OVERWRITE TABLE dest1 SELECT reverse(src1.value) PREHOOK: type: QUERY @@ -159,18 +161,22 @@ PREHOOK: query: -- Test with non-ascii characters -- 0xE993AEE982B5 CREATE TABLE dest1(name STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test with non-ascii characters -- kv4.txt contains the text 0xE982B5E993AE, which should be reversed to -- 0xE993AEE982B5 CREATE TABLE dest1(name STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.len EXPRESSION [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv4.txt' INTO TABLE dest1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dest1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv4.txt' INTO TABLE dest1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.len EXPRESSION [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: SELECT count(1) FROM dest1 WHERE reverse(dest1.name) = _UTF-8 0xE993AEE982B5 diff --git a/ql/src/test/results/clientpositive/udf_round_2.q.out b/ql/src/test/results/clientpositive/udf_round_2.q.out index 400b2fb..71f1d0d 100644 --- a/ql/src/test/results/clientpositive/udf_round_2.q.out +++ b/ql/src/test/results/clientpositive/udf_round_2.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- test for NaN (not-a-number) create table tstTbl1(n double) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- test for NaN (not-a-number) create table tstTbl1(n double) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstTbl1 PREHOOK: query: insert overwrite table tstTbl1 select 'NaN' from src tablesample (1 rows) diff --git a/ql/src/test/results/clientpositive/udf_sentences.q.out b/ql/src/test/results/clientpositive/udf_sentences.q.out index a24f239..70c8102 100644 --- a/ql/src/test/results/clientpositive/udf_sentences.q.out +++ b/ql/src/test/results/clientpositive/udf_sentences.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE sent_tmp (val array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE sent_tmp (val array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@sent_tmp PREHOOK: query: CREATE TABLE sent_tmp2 (val string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE sent_tmp2 (val string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@sent_tmp2 PREHOOK: query: INSERT OVERWRITE TABLE sent_tmp SELECT explode(sentences(decode(unhex("486976652065737420756E20657863656C6C656E74206F7574696C20706F7572206C65732072657175C3AA74657320646520646F6E6EC3A965732C20657420706575742DC3AA74726520706C757320706F6C7976616C656E7420717565206C612074726164756374696F6E206175746F6D61746971756521206C6120706F6E6374756174696F6E206D756C7469706C65732C206465732070687261736573206D616C20666F726DC3A96573202E2E2E20636F6E667573696F6E202D20657420706F757274616E742063652055444620666F6E6374696F6E6E6520656E636F72652121"), "UTF-8"), "fr")) AS val FROM src LIMIT 3 @@ -113,15 +117,19 @@ POSTHOOK: Lineage: sent_tmp.val SCRIPT [] POSTHOOK: Lineage: sent_tmp2.val SCRIPT [(sent_tmp)sent_tmp.FieldSchema(name:val, type:array, comment:null), ] PREHOOK: query: CREATE TABLE sent_tmp (val array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE sent_tmp (val array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@sent_tmp POSTHOOK: Lineage: sent_tmp.val SCRIPT [] POSTHOOK: Lineage: sent_tmp2.val SCRIPT [(sent_tmp)sent_tmp.FieldSchema(name:val, type:array, comment:null), ] PREHOOK: query: CREATE TABLE sent_tmp2 (val string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE sent_tmp2 (val string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@sent_tmp2 POSTHOOK: Lineage: sent_tmp.val SCRIPT [] POSTHOOK: Lineage: sent_tmp2.val SCRIPT [(sent_tmp)sent_tmp.FieldSchema(name:val, type:array, comment:null), ] diff --git a/ql/src/test/results/clientpositive/udf_sort_array.q.out b/ql/src/test/results/clientpositive/udf_sort_array.q.out index 536c77d..9d93f26 100644 --- a/ql/src/test/results/clientpositive/udf_sort_array.q.out +++ b/ql/src/test/results/clientpositive/udf_sort_array.q.out @@ -98,6 +98,7 @@ CREATE TABLE dest1 ( timestamps ARRAY ) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test it against data in a table. CREATE TABLE dest1 ( tinyints ARRAY, @@ -111,12 +112,15 @@ CREATE TABLE dest1 ( timestamps ARRAY ) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/primitive_type_arrays.txt' OVERWRITE INTO TABLE dest1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@dest1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/primitive_type_arrays.txt' OVERWRITE INTO TABLE dest1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@dest1 PREHOOK: query: SELECT sort_array(tinyints), sort_array(smallints), sort_array(ints), sort_array(bigints), sort_array(booleans), sort_array(floats), diff --git a/ql/src/test/results/clientpositive/udf_to_unix_timestamp.q.out b/ql/src/test/results/clientpositive/udf_to_unix_timestamp.q.out index 8b5f6f2..c177d90 100644 --- a/ql/src/test/results/clientpositive/udf_to_unix_timestamp.q.out +++ b/ql/src/test/results/clientpositive/udf_to_unix_timestamp.q.out @@ -11,14 +11,18 @@ to_unix_timestamp(date[, pattern]) - Returns the UNIX timestamp Converts the specified time to number of seconds since 1970-01-01. PREHOOK: query: create table oneline(key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table oneline(key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@oneline PREHOOK: query: load data local inpath '../../data/files/things.txt' into table oneline PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@oneline POSTHOOK: query: load data local inpath '../../data/files/things.txt' into table oneline POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@oneline PREHOOK: query: SELECT '2009-03-20 11:30:01', diff --git a/ql/src/test/results/clientpositive/udf_translate.q.out b/ql/src/test/results/clientpositive/udf_translate.q.out index e83eab6..5ae8793 100644 --- a/ql/src/test/results/clientpositive/udf_translate.q.out +++ b/ql/src/test/results/clientpositive/udf_translate.q.out @@ -23,14 +23,18 @@ translate('abcdef', 'ada', '192') returns '1bc9ef' replaces 'a' with '1' and 'd' PREHOOK: query: -- Create some tables to serve some input data CREATE TABLE table_input(input STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Create some tables to serve some input data CREATE TABLE table_input(input STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_input PREHOOK: query: CREATE TABLE table_translate(input_string STRING, from_string STRING, to_string STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE table_translate(input_string STRING, from_string STRING, to_string STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@table_translate PREHOOK: query: FROM src INSERT OVERWRITE TABLE table_input SELECT 'abcd' WHERE src.key = 86 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/udf_unix_timestamp.q.out b/ql/src/test/results/clientpositive/udf_unix_timestamp.q.out index d2295bf..f21dba2 100644 --- a/ql/src/test/results/clientpositive/udf_unix_timestamp.q.out +++ b/ql/src/test/results/clientpositive/udf_unix_timestamp.q.out @@ -11,14 +11,18 @@ unix_timestamp([date[, pattern]]) - Returns the UNIX timestamp Converts the current or specified time to number of seconds since 1970-01-01. PREHOOK: query: create table oneline(key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table oneline(key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@oneline PREHOOK: query: load data local inpath '../../data/files/things.txt' into table oneline PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@oneline POSTHOOK: query: load data local inpath '../../data/files/things.txt' into table oneline POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@oneline PREHOOK: query: SELECT '2009-03-20 11:30:01', diff --git a/ql/src/test/results/clientpositive/udtf_json_tuple.q.out b/ql/src/test/results/clientpositive/udtf_json_tuple.q.out index 384fcc0..f151740 100644 --- a/ql/src/test/results/clientpositive/udtf_json_tuple.q.out +++ b/ql/src/test/results/clientpositive/udtf_json_tuple.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table json_t (key string, jstring string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table json_t (key string, jstring string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@json_t PREHOOK: query: insert overwrite table json_t select * from ( @@ -409,10 +411,12 @@ PREHOOK: query: -- Verify that json_tuple can handle new lines in JSON values CREATE TABLE dest1(c1 STRING) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Verify that json_tuple can handle new lines in JSON values CREATE TABLE dest1(c1 STRING) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: json_t.jstring EXPRESSION [] POSTHOOK: Lineage: json_t.key EXPRESSION [] diff --git a/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out b/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out index 8373d8e..74d9e96 100644 --- a/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out +++ b/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table url_t (key string, fullurl string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table url_t (key string, fullurl string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@url_t PREHOOK: query: insert overwrite table url_t select * from ( diff --git a/ql/src/test/results/clientpositive/udtf_posexplode.q.out b/ql/src/test/results/clientpositive/udtf_posexplode.q.out index 54eb493..83a786f 100644 --- a/ql/src/test/results/clientpositive/udtf_posexplode.q.out +++ b/ql/src/test/results/clientpositive/udtf_posexplode.q.out @@ -5,6 +5,7 @@ subordinates ARRAY, deductions MAP, address STRUCT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE employees ( name STRING, salary FLOAT, @@ -12,12 +13,15 @@ subordinates ARRAY, deductions MAP, address STRUCT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@employees PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/posexplode_data.txt' INTO TABLE employees PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@employees POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/posexplode_data.txt' INTO TABLE employees POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@employees PREHOOK: query: SELECT name, pos, sub diff --git a/ql/src/test/results/clientpositive/unicode_notation.q.out b/ql/src/test/results/clientpositive/unicode_notation.q.out index 88f3034..b650fa1 100644 --- a/ql/src/test/results/clientpositive/unicode_notation.q.out +++ b/ql/src/test/results/clientpositive/unicode_notation.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- HIVE-4618 hive should accept unicode notation like \uxxxx CREATE TABLE k1( a string)ROW FORMAT DELIMITED FIELDS TERMINATED BY '\u0001' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- HIVE-4618 hive should accept unicode notation like \uxxxx CREATE TABLE k1( a string)ROW FORMAT DELIMITED FIELDS TERMINATED BY '\u0001' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@k1 PREHOOK: query: desc formatted k1 PREHOOK: type: DESCTABLE @@ -46,8 +48,10 @@ POSTHOOK: Input: default@k1 POSTHOOK: Output: default@k1 PREHOOK: query: CREATE TABLE k1( a string)ROW FORMAT DELIMITED FIELDS TERMINATED BY '\001' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE k1( a string)ROW FORMAT DELIMITED FIELDS TERMINATED BY '\001' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@k1 PREHOOK: query: desc formatted k1 PREHOOK: type: DESCTABLE @@ -88,8 +92,10 @@ POSTHOOK: Input: default@k1 POSTHOOK: Output: default@k1 PREHOOK: query: CREATE TABLE k1( a string)ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE k1( a string)ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@k1 PREHOOK: query: desc formatted k1 PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/union10.q.out b/ql/src/test/results/clientpositive/union10.q.out index 9342735..8ecda0b 100644 --- a/ql/src/test/results/clientpositive/union10.q.out +++ b/ql/src/test/results/clientpositive/union10.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union create table tmptable(key string, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink create table tmptable(key string, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: explain insert overwrite table tmptable diff --git a/ql/src/test/results/clientpositive/union12.q.out b/ql/src/test/results/clientpositive/union12.q.out index c5441c3..4ec13ef 100644 --- a/ql/src/test/results/clientpositive/union12.q.out +++ b/ql/src/test/results/clientpositive/union12.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union create table tmptable(key string, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink create table tmptable(key string, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: explain insert overwrite table tmptable diff --git a/ql/src/test/results/clientpositive/union17.q.out b/ql/src/test/results/clientpositive/union17.q.out index 3efc03c..2054fe4 100644 --- a/ql/src/test/results/clientpositive/union17.q.out +++ b/ql/src/test/results/clientpositive/union17.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert diff --git a/ql/src/test/results/clientpositive/union18.q.out b/ql/src/test/results/clientpositive/union18.q.out index 1933ac4..d58a2e8 100644 --- a/ql/src/test/results/clientpositive/union18.q.out +++ b/ql/src/test/results/clientpositive/union18.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert diff --git a/ql/src/test/results/clientpositive/union19.q.out b/ql/src/test/results/clientpositive/union19.q.out index ff61868..db4afce 100644 --- a/ql/src/test/results/clientpositive/union19.q.out +++ b/ql/src/test/results/clientpositive/union19.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST1 PREHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@DEST2 PREHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert diff --git a/ql/src/test/results/clientpositive/union22.q.out b/ql/src/test/results/clientpositive/union22.q.out index eb5ad5c..42ba60d 100644 --- a/ql/src/test/results/clientpositive/union22.q.out +++ b/ql/src/test/results/clientpositive/union22.q.out @@ -1,12 +1,16 @@ PREHOOK: query: create table dst_union22(k1 string, k2 string, k3 string, k4 string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dst_union22(k1 string, k2 string, k3 string, k4 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dst_union22 PREHOOK: query: create table dst_union22_delta(k0 string, k1 string, k2 string, k3 string, k4 string, k5 string) partitioned by (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table dst_union22_delta(k0 string, k1 string, k2 string, k3 string, k4 string, k5 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@dst_union22_delta PREHOOK: query: insert overwrite table dst_union22 partition (ds='1') select key, value, key , value from src diff --git a/ql/src/test/results/clientpositive/union25.q.out b/ql/src/test/results/clientpositive/union25.q.out index 73635f9..1ebe682 100644 --- a/ql/src/test/results/clientpositive/union25.q.out +++ b/ql/src/test/results/clientpositive/union25.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table tmp_srcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tmp_srcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp_srcpart PREHOOK: query: insert overwrite table tmp_srcpart partition (ds='2008-04-08', hr='11') select key, value from srcpart where ds='2008-04-08' and hr='11' diff --git a/ql/src/test/results/clientpositive/union28.q.out b/ql/src/test/results/clientpositive/union28.q.out index c8b738f..4252062 100644 --- a/ql/src/test/results/clientpositive/union28.q.out +++ b/ql/src/test/results/clientpositive/union28.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table union_subq_union(key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table union_subq_union(key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@union_subq_union PREHOOK: query: explain insert overwrite table union_subq_union diff --git a/ql/src/test/results/clientpositive/union29.q.out b/ql/src/test/results/clientpositive/union29.q.out index 47dfd84..3744610 100644 --- a/ql/src/test/results/clientpositive/union29.q.out +++ b/ql/src/test/results/clientpositive/union29.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table union_subq_union(key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table union_subq_union(key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@union_subq_union PREHOOK: query: explain insert overwrite table union_subq_union diff --git a/ql/src/test/results/clientpositive/union3.q.out b/ql/src/test/results/clientpositive/union3.q.out index 10a97d1..7f1b7fb 100644 --- a/ql/src/test/results/clientpositive/union3.q.out +++ b/ql/src/test/results/clientpositive/union3.q.out @@ -287,8 +287,10 @@ STAGE PLANS: PREHOOK: query: CREATE TABLE union_out (id int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE union_out (id int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@union_out PREHOOK: query: insert overwrite table union_out SELECT * diff --git a/ql/src/test/results/clientpositive/union30.q.out b/ql/src/test/results/clientpositive/union30.q.out index 054e6ae..194b3b8 100644 --- a/ql/src/test/results/clientpositive/union30.q.out +++ b/ql/src/test/results/clientpositive/union30.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table union_subq_union(key int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table union_subq_union(key int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@union_subq_union PREHOOK: query: explain insert overwrite table union_subq_union diff --git a/ql/src/test/results/clientpositive/union31.q.out b/ql/src/test/results/clientpositive/union31.q.out index 8ac096e..2f7031f 100644 --- a/ql/src/test/results/clientpositive/union31.q.out +++ b/ql/src/test/results/clientpositive/union31.q.out @@ -22,13 +22,17 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@t2 PREHOOK: query: create table t3(key string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t3(key string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t3 PREHOOK: query: create table t4(value string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t4(value string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t4 PREHOOK: query: explain from @@ -292,8 +296,10 @@ val_8 2 val_9 2 PREHOOK: query: create table t5(c1 string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t5(c1 string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t5 POSTHOOK: Lineage: t3.cnt EXPRESSION [(t2)t2.null, (t1)t1.null, ] POSTHOOK: Lineage: t3.key EXPRESSION [(t2)t2.FieldSchema(name:key, type:string, comment:null), (t1)t1.FieldSchema(name:key, type:string, comment:null), ] @@ -301,8 +307,10 @@ POSTHOOK: Lineage: t4.cnt EXPRESSION [(t2)t2.null, (t1)t1.null, ] POSTHOOK: Lineage: t4.value EXPRESSION [(t2)t2.FieldSchema(name:value, type:string, comment:null), (t1)t1.FieldSchema(name:value, type:string, comment:null), ] PREHOOK: query: create table t6(c1 string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t6(c1 string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t6 POSTHOOK: Lineage: t3.cnt EXPRESSION [(t2)t2.null, (t1)t1.null, ] POSTHOOK: Lineage: t3.key EXPRESSION [(t2)t2.FieldSchema(name:key, type:string, comment:null), (t1)t1.FieldSchema(name:key, type:string, comment:null), ] @@ -667,8 +675,10 @@ POSTHOOK: Lineage: t6.c1 EXPRESSION [(t2)t2.FieldSchema(name:key, type:string, c POSTHOOK: Lineage: t6.cnt EXPRESSION [(t2)t2.null, (t1)t1.null, ] PREHOOK: query: create table t7(c1 string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t7(c1 string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t7 POSTHOOK: Lineage: t3.cnt EXPRESSION [(t2)t2.null, (t1)t1.null, ] POSTHOOK: Lineage: t3.key EXPRESSION [(t2)t2.FieldSchema(name:key, type:string, comment:null), (t1)t1.FieldSchema(name:key, type:string, comment:null), ] @@ -680,8 +690,10 @@ POSTHOOK: Lineage: t6.c1 EXPRESSION [(t2)t2.FieldSchema(name:key, type:string, c POSTHOOK: Lineage: t6.cnt EXPRESSION [(t2)t2.null, (t1)t1.null, ] PREHOOK: query: create table t8(c1 string, cnt int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t8(c1 string, cnt int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t8 POSTHOOK: Lineage: t3.cnt EXPRESSION [(t2)t2.null, (t1)t1.null, ] POSTHOOK: Lineage: t3.key EXPRESSION [(t2)t2.FieldSchema(name:key, type:string, comment:null), (t1)t1.FieldSchema(name:key, type:string, comment:null), ] diff --git a/ql/src/test/results/clientpositive/union33.q.out b/ql/src/test/results/clientpositive/union33.q.out index 09bba51..6ac1951 100644 --- a/ql/src/test/results/clientpositive/union33.q.out +++ b/ql/src/test/results/clientpositive/union33.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- This tests that a union all with a map only subquery on one s CREATE TABLE test_src (key STRING, value STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This tests that a union all with a map only subquery on one side and a -- subquery involving two map reduce jobs on the other runs correctly. CREATE TABLE test_src (key STRING, value STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_src PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_src SELECT key, value FROM ( diff --git a/ql/src/test/results/clientpositive/union34.q.out b/ql/src/test/results/clientpositive/union34.q.out index cc7ad8c..fba87d0 100644 --- a/ql/src/test/results/clientpositive/union34.q.out +++ b/ql/src/test/results/clientpositive/union34.q.out @@ -1,22 +1,30 @@ PREHOOK: query: create table src10_1 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src10_1 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src10_1 PREHOOK: query: create table src10_2 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src10_2 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src10_2 PREHOOK: query: create table src10_3 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src10_3 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src10_3 PREHOOK: query: create table src10_4 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table src10_4 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src10_4 PREHOOK: query: from (select * from src tablesample (10 rows)) a insert overwrite table src10_1 select * diff --git a/ql/src/test/results/clientpositive/union4.q.out b/ql/src/test/results/clientpositive/union4.q.out index 5b174a0..837c486 100644 --- a/ql/src/test/results/clientpositive/union4.q.out +++ b/ql/src/test/results/clientpositive/union4.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- union case: both subqueries are map-reduce jobs on same input create table tmptable(key string, value int) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by filesink create table tmptable(key string, value int) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: explain insert overwrite table tmptable diff --git a/ql/src/test/results/clientpositive/union6.q.out b/ql/src/test/results/clientpositive/union6.q.out index 4f35a6b..bfb7dc5 100644 --- a/ql/src/test/results/clientpositive/union6.q.out +++ b/ql/src/test/results/clientpositive/union6.q.out @@ -3,11 +3,13 @@ PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs create table tmptable(key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink create table tmptable(key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tmptable PREHOOK: query: explain insert overwrite table tmptable diff --git a/ql/src/test/results/clientpositive/union_date.q.out b/ql/src/test/results/clientpositive/union_date.q.out index 92b94ad..b1afd42 100644 --- a/ql/src/test/results/clientpositive/union_date.q.out +++ b/ql/src/test/results/clientpositive/union_date.q.out @@ -14,6 +14,7 @@ PREHOOK: query: create table union_date_1 ( FL_NUM int ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table union_date_1 ( ORIGIN_CITY_NAME string, DEST_CITY_NAME string, @@ -22,6 +23,7 @@ POSTHOOK: query: create table union_date_1 ( FL_NUM int ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@union_date_1 PREHOOK: query: create table union_date_2 ( ORIGIN_CITY_NAME string, @@ -31,6 +33,7 @@ PREHOOK: query: create table union_date_2 ( FL_NUM int ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table union_date_2 ( ORIGIN_CITY_NAME string, DEST_CITY_NAME string, @@ -39,18 +42,23 @@ POSTHOOK: query: create table union_date_2 ( FL_NUM int ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@union_date_2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_join.txt' OVERWRITE INTO TABLE union_date_1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@union_date_1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_join.txt' OVERWRITE INTO TABLE union_date_1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@union_date_1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_join.txt' OVERWRITE INTO TABLE union_date_2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@union_date_2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/flights_join.txt' OVERWRITE INTO TABLE union_date_2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@union_date_2 PREHOOK: query: select * from ( select fl_num, fl_date from union_date_1 diff --git a/ql/src/test/results/clientpositive/union_lateralview.q.out b/ql/src/test/results/clientpositive/union_lateralview.q.out index 85a4778..dfa0728 100644 --- a/ql/src/test/results/clientpositive/union_lateralview.q.out +++ b/ql/src/test/results/clientpositive/union_lateralview.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create table test_union_lateral_view(key int, arr_ele int, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table test_union_lateral_view(key int, arr_ele int, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@test_union_lateral_view PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_union_lateral_view diff --git a/ql/src/test/results/clientpositive/union_remove_6.q.out b/ql/src/test/results/clientpositive/union_remove_6.q.out index 2e2d919..9cb89fa 100644 --- a/ql/src/test/results/clientpositive/union_remove_6.q.out +++ b/ql/src/test/results/clientpositive/union_remove_6.q.out @@ -7,6 +7,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 subqueries is performed (all of which are mapred queries) -- followed by select star and a file sink in 2 output tables. @@ -16,22 +17,29 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl2(key string, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl2 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain FROM ( diff --git a/ql/src/test/results/clientpositive/union_view.q.out b/ql/src/test/results/clientpositive/union_view.q.out index 3738702..4eaaeaa 100644 --- a/ql/src/test/results/clientpositive/union_view.q.out +++ b/ql/src/test/results/clientpositive/union_view.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE src_union_1 (key int, value string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_union_1 (key int, value string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_union_1 PREHOOK: query: CREATE INDEX src_union_1_key_idx ON TABLE src_union_1(key) AS 'COMPACT' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX @@ -10,8 +12,10 @@ POSTHOOK: type: CREATEINDEX POSTHOOK: Output: default@default__src_union_1_src_union_1_key_idx__ PREHOOK: query: CREATE TABLE src_union_2 (key int, value string) PARTITIONED BY (ds string, part_1 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_union_2 (key int, value string) PARTITIONED BY (ds string, part_1 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_union_2 PREHOOK: query: CREATE INDEX src_union_2_key_idx ON TABLE src_union_2(key) AS 'COMPACT' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX @@ -20,8 +24,10 @@ POSTHOOK: type: CREATEINDEX POSTHOOK: Output: default@default__src_union_2_src_union_2_key_idx__ PREHOOK: query: CREATE TABLE src_union_3(key int, value string) PARTITIONED BY (ds string, part_1 string, part_2 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_union_3(key int, value string) PARTITIONED BY (ds string, part_1 string, part_2 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_union_3 PREHOOK: query: CREATE INDEX src_union_3_key_idx ON TABLE src_union_3(key) AS 'COMPACT' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX diff --git a/ql/src/test/results/clientpositive/uniquejoin.q.out b/ql/src/test/results/clientpositive/uniquejoin.q.out index 00172b5..519b603 100644 --- a/ql/src/test/results/clientpositive/uniquejoin.q.out +++ b/ql/src/test/results/clientpositive/uniquejoin.q.out @@ -1,35 +1,47 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@t3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@t3 PREHOOK: query: FROM UNIQUEJOIN PRESERVE T1 a (a.key), PRESERVE T2 b (b.key), PRESERVE T3 c (c.key) SELECT a.key, b.key, c.key diff --git a/ql/src/test/results/clientpositive/unset_table_view_property.q.out b/ql/src/test/results/clientpositive/unset_table_view_property.q.out index f9c0b39..aafc206 100644 --- a/ql/src/test/results/clientpositive/unset_table_view_property.q.out +++ b/ql/src/test/results/clientpositive/unset_table_view_property.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE testTable(col1 INT, col2 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE testTable(col1 INT, col2 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@testTable PREHOOK: query: SHOW TBLPROPERTIES testTable PREHOOK: type: SHOW_TBLPROPERTIES diff --git a/ql/src/test/results/clientpositive/updateAccessTime.q.out b/ql/src/test/results/clientpositive/updateAccessTime.q.out index c800703..2695c8d 100644 --- a/ql/src/test/results/clientpositive/updateAccessTime.q.out +++ b/ql/src/test/results/clientpositive/updateAccessTime.q.out @@ -48,8 +48,10 @@ POSTHOOK: query: drop table tstsrcpart POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@tstsrcpart PREHOOK: query: insert overwrite table tstsrcpart partition (ds, hr) select key, value, ds, hr from srcpart PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/varchar_1.q.out b/ql/src/test/results/clientpositive/varchar_1.q.out index 0757dff..e3bee83 100644 --- a/ql/src/test/results/clientpositive/varchar_1.q.out +++ b/ql/src/test/results/clientpositive/varchar_1.q.out @@ -8,21 +8,27 @@ POSTHOOK: query: drop table varchar1_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table varchar1 (key varchar(10), value varchar(20)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar1 (key varchar(10), value varchar(20)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar1 PREHOOK: query: create table varchar1_1 (key string, value string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar1_1 (key string, value string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar1_1 PREHOOK: query: -- load from file load data local inpath '../../data/files/srcbucket0.txt' overwrite into table varchar1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@varchar1 POSTHOOK: query: -- load from file load data local inpath '../../data/files/srcbucket0.txt' overwrite into table varchar1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@varchar1 PREHOOK: query: select * from varchar1 order by key, value limit 2 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/varchar_2.q.out b/ql/src/test/results/clientpositive/varchar_2.q.out index 50ab30f..5a8323c 100644 --- a/ql/src/test/results/clientpositive/varchar_2.q.out +++ b/ql/src/test/results/clientpositive/varchar_2.q.out @@ -7,11 +7,13 @@ PREHOOK: query: create table varchar_2 ( value varchar(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar_2 ( key varchar(10), value varchar(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_2 PREHOOK: query: insert overwrite table varchar_2 select * from src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/varchar_join1.q.out b/ql/src/test/results/clientpositive/varchar_join1.q.out index c99e8e4..94084d8 100644 --- a/ql/src/test/results/clientpositive/varchar_join1.q.out +++ b/ql/src/test/results/clientpositive/varchar_join1.q.out @@ -15,51 +15,63 @@ PREHOOK: query: create table varchar_join1_vc1 ( c2 varchar(10) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar_join1_vc1 ( c1 int, c2 varchar(10) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_join1_vc1 PREHOOK: query: create table varchar_join1_vc2 ( c1 int, c2 varchar(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar_join1_vc2 ( c1 int, c2 varchar(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_join1_vc2 PREHOOK: query: create table varchar_join1_str ( c1 int, c2 string ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar_join1_str ( c1 int, c2 string ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_join1_str PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_join1_vc1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@varchar_join1_vc1 POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_join1_vc1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@varchar_join1_vc1 PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_join1_vc2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@varchar_join1_vc2 POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_join1_vc2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@varchar_join1_vc2 PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_join1_str PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@varchar_join1_str POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_join1_str POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@varchar_join1_str PREHOOK: query: -- Join varchar with same length varchar select * from varchar_join1_vc1 a join varchar_join1_vc1 b on (a.c2 = b.c2) order by a.c1 diff --git a/ql/src/test/results/clientpositive/varchar_nested_types.q.out b/ql/src/test/results/clientpositive/varchar_nested_types.q.out index 16a6a74..51f0c8a 100644 --- a/ql/src/test/results/clientpositive/varchar_nested_types.q.out +++ b/ql/src/test/results/clientpositive/varchar_nested_types.q.out @@ -24,8 +24,10 @@ POSTHOOK: query: drop table varchar_nested_view POSTHOOK: type: DROPTABLE PREHOOK: query: create table varchar_nested_1 (key int, value varchar(20)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar_nested_1 (key int, value varchar(20)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_nested_1 PREHOOK: query: insert overwrite table varchar_nested_1 select key, value from src order by key limit 1 @@ -42,9 +44,11 @@ POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name: PREHOOK: query: -- arrays create table varchar_nested_array (c1 array) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- arrays create table varchar_nested_array (c1 array) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_nested_array POSTHOOK: Lineage: varchar_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -84,9 +88,11 @@ POSTHOOK: Lineage: varchar_nested_array.c1 EXPRESSION [(varchar_nested_1)varchar PREHOOK: query: -- maps create table varchar_nested_map (c1 map) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- maps create table varchar_nested_map (c1 map) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_nested_map POSTHOOK: Lineage: varchar_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -130,9 +136,11 @@ POSTHOOK: Lineage: varchar_nested_map.c1 EXPRESSION [(varchar_nested_1)varchar_n PREHOOK: query: -- structs create table varchar_nested_struct (c1 struct) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- structs create table varchar_nested_struct (c1 struct) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_nested_struct POSTHOOK: Lineage: varchar_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] diff --git a/ql/src/test/results/clientpositive/varchar_serde.q.out b/ql/src/test/results/clientpositive/varchar_serde.q.out index 1cccd60..cb312e7 100644 --- a/ql/src/test/results/clientpositive/varchar_serde.q.out +++ b/ql/src/test/results/clientpositive/varchar_serde.q.out @@ -35,6 +35,7 @@ with serdeproperties ( ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- RegexSerDe -- @@ -48,12 +49,15 @@ with serdeproperties ( ) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_serde_regex PREHOOK: query: load data local inpath '../../data/files/srcbucket0.txt' overwrite into table varchar_serde_regex PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@varchar_serde_regex POSTHOOK: query: load data local inpath '../../data/files/srcbucket0.txt' overwrite into table varchar_serde_regex POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@varchar_serde_regex PREHOOK: query: select * from varchar_serde_regex limit 5 PREHOOK: type: QUERY @@ -89,6 +93,7 @@ create table varchar_serde_lb ( value varchar(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- LazyBinary -- @@ -97,6 +102,7 @@ create table varchar_serde_lb ( value varchar(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_serde_lb PREHOOK: query: alter table varchar_serde_lb set serde 'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe' PREHOOK: type: ALTERTABLE_SERIALIZER @@ -156,6 +162,7 @@ create table varchar_serde_ls ( value varchar(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- LazySimple -- @@ -164,6 +171,7 @@ create table varchar_serde_ls ( value varchar(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_serde_ls POSTHOOK: Lineage: varchar_serde_lb.key SIMPLE [(varchar_serde_regex)varchar_serde_regex.FieldSchema(name:key, type:varchar(10), comment:from deserializer), ] POSTHOOK: Lineage: varchar_serde_lb.value SIMPLE [(varchar_serde_regex)varchar_serde_regex.FieldSchema(name:value, type:varchar(20), comment:from deserializer), ] @@ -233,6 +241,7 @@ create table varchar_serde_c ( value varchar(20) ) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- Columnar -- @@ -241,6 +250,7 @@ create table varchar_serde_c ( value varchar(20) ) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_serde_c POSTHOOK: Lineage: varchar_serde_lb.key SIMPLE [(varchar_serde_regex)varchar_serde_regex.FieldSchema(name:key, type:varchar(10), comment:from deserializer), ] POSTHOOK: Lineage: varchar_serde_lb.value SIMPLE [(varchar_serde_regex)varchar_serde_regex.FieldSchema(name:value, type:varchar(20), comment:from deserializer), ] @@ -320,6 +330,7 @@ create table varchar_serde_lbc ( value varchar(20) ) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- LazyBinaryColumnar -- @@ -328,6 +339,7 @@ create table varchar_serde_lbc ( value varchar(20) ) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_serde_lbc POSTHOOK: Lineage: varchar_serde_c.key SIMPLE [(varchar_serde_ls)varchar_serde_ls.FieldSchema(name:key, type:varchar(10), comment:from deserializer), ] POSTHOOK: Lineage: varchar_serde_c.value SIMPLE [(varchar_serde_ls)varchar_serde_ls.FieldSchema(name:value, type:varchar(20), comment:from deserializer), ] @@ -417,6 +429,7 @@ create table varchar_serde_orc ( value varchar(20) ) stored as orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- -- ORC -- @@ -425,6 +438,7 @@ create table varchar_serde_orc ( value varchar(20) ) stored as orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_serde_orc POSTHOOK: Lineage: varchar_serde_c.key SIMPLE [(varchar_serde_ls)varchar_serde_ls.FieldSchema(name:key, type:varchar(10), comment:from deserializer), ] POSTHOOK: Lineage: varchar_serde_c.value SIMPLE [(varchar_serde_ls)varchar_serde_ls.FieldSchema(name:value, type:varchar(20), comment:from deserializer), ] diff --git a/ql/src/test/results/clientpositive/varchar_udf1.q.out b/ql/src/test/results/clientpositive/varchar_udf1.q.out index f4b9366..3203b7c 100644 --- a/ql/src/test/results/clientpositive/varchar_udf1.q.out +++ b/ql/src/test/results/clientpositive/varchar_udf1.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop table varchar_udf_1 POSTHOOK: type: DROPTABLE PREHOOK: query: create table varchar_udf_1 (c1 string, c2 string, c3 varchar(10), c4 varchar(20)) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar_udf_1 (c1 string, c2 string, c3 varchar(10), c4 varchar(20)) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_udf_1 PREHOOK: query: insert overwrite table varchar_udf_1 select key, value, key, value from src where key = '238' limit 1 diff --git a/ql/src/test/results/clientpositive/varchar_union1.q.out b/ql/src/test/results/clientpositive/varchar_union1.q.out index a591551..4616827 100644 --- a/ql/src/test/results/clientpositive/varchar_union1.q.out +++ b/ql/src/test/results/clientpositive/varchar_union1.q.out @@ -15,51 +15,63 @@ PREHOOK: query: create table varchar_union1_vc1 ( c2 varchar(10) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar_union1_vc1 ( c1 int, c2 varchar(10) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_union1_vc1 PREHOOK: query: create table varchar_union1_vc2 ( c1 int, c2 varchar(20) ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar_union1_vc2 ( c1 int, c2 varchar(20) ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_union1_vc2 PREHOOK: query: create table varchar_union1_str ( c1 int, c2 string ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table varchar_union1_str ( c1 int, c2 string ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@varchar_union1_str PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_union1_vc1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@varchar_union1_vc1 POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_union1_vc1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@varchar_union1_vc1 PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_union1_vc2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@varchar_union1_vc2 POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_union1_vc2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@varchar_union1_vc2 PREHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_union1_str PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@varchar_union1_str POSTHOOK: query: load data local inpath '../../data/files/vc1.txt' into table varchar_union1_str POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@varchar_union1_str PREHOOK: query: -- union varchar with same length varchar select * from ( diff --git a/ql/src/test/results/clientpositive/vectorization_part.q.out b/ql/src/test/results/clientpositive/vectorization_part.q.out index 6d4f511..2ac4ddd 100644 --- a/ql/src/test/results/clientpositive/vectorization_part.q.out +++ b/ql/src/test/results/clientpositive/vectorization_part.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint smallint, cint int, cbigint bigint, cfloat float, cdouble double, cstring1 string, cstring2 string, ctimestamp1 timestamp, ctimestamp2 timestamp, cboolean1 boolean, cboolean2 boolean) partitioned by (ds string) STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint smallint, cint int, cbigint bigint, cfloat float, cdouble double, cstring1 string, cstring2 string, ctimestamp1 timestamp, ctimestamp2 timestamp, cboolean1 boolean, cboolean2 boolean) partitioned by (ds string) STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_part PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/vectorization_part_project.q.out b/ql/src/test/results/clientpositive/vectorization_part_project.q.out index faab239..36a45df 100644 --- a/ql/src/test/results/clientpositive/vectorization_part_project.q.out +++ b/ql/src/test/results/clientpositive/vectorization_part_project.q.out @@ -1,7 +1,9 @@ PREHOOK: query: CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint smallint, cint int, cbigint bigint, cfloat float, cdouble double, cstring1 string, cstring2 string, ctimestamp1 timestamp, ctimestamp2 timestamp, cboolean1 boolean, cboolean2 boolean) partitioned by (ds string) STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint smallint, cint int, cbigint bigint, cfloat float, cdouble double, cstring1 string, cstring2 string, ctimestamp1 timestamp, ctimestamp2 timestamp, cboolean1 boolean, cboolean2 boolean) partitioned by (ds string) STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_part PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out index fb8fe02..5403204 100644 --- a/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out +++ b/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out @@ -3,44 +3,52 @@ PREHOOK: query: create table vsmb_bucket_1(key int, value string) SORTED BY (key) INTO 1 BUCKETS STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table vsmb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@vsmb_bucket_1 PREHOOK: query: create table vsmb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table vsmb_bucket_2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@vsmb_bucket_2 PREHOOK: query: create table vsmb_bucket_RC(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table vsmb_bucket_RC(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@vsmb_bucket_RC PREHOOK: query: create table vsmb_bucket_TXT(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table vsmb_bucket_TXT(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@vsmb_bucket_TXT PREHOOK: query: insert into table vsmb_bucket_1 select cint, cstring1 from alltypesorc limit 2 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/vectorized_context.q.out b/ql/src/test/results/clientpositive/vectorized_context.q.out index a13f861..7a2f773 100644 --- a/ql/src/test/results/clientpositive/vectorized_context.q.out +++ b/ql/src/test/results/clientpositive/vectorized_context.q.out @@ -1,9 +1,11 @@ PREHOOK: query: create table store(s_store_sk int, s_city string) stored as orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table store(s_store_sk int, s_city string) stored as orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@store PREHOOK: query: insert overwrite table store select cint, cstring1 @@ -26,9 +28,11 @@ POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema PREHOOK: query: create table store_sales(ss_store_sk int, ss_hdemo_sk int, ss_net_profit double) stored as orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table store_sales(ss_store_sk int, ss_hdemo_sk int, ss_net_profit double) stored as orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@store_sales POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] @@ -56,9 +60,11 @@ POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.Fiel PREHOOK: query: create table household_demographics(hd_demo_sk int) stored as orc PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table household_demographics(hd_demo_sk int) stored as orc POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@household_demographics POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] diff --git a/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out b/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out index d293770..1000b36 100644 --- a/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out +++ b/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out @@ -8,6 +8,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: --This query must pass even when vectorized reader is not available for --RC files. The query must fall back to the non-vector mode and run successfully. @@ -18,6 +19,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@columnTable PREHOOK: query: FROM src INSERT OVERWRITE TABLE columnTable SELECT src.key, src.value LIMIT 10 diff --git a/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out b/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out index 1980eb6..70c654c 100644 --- a/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out +++ b/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- Test timestamp functions in vectorized mode to verify they ru CREATE TABLE alltypesorc_string(ctimestamp1 timestamp, stimestamp1 string) STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Test timestamp functions in vectorized mode to verify they run correctly end-to-end. CREATE TABLE alltypesorc_string(ctimestamp1 timestamp, stimestamp1 string) STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_string PREHOOK: query: INSERT OVERWRITE TABLE alltypesorc_string SELECT @@ -29,8 +31,10 @@ POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)allty POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] PREHOOK: query: CREATE TABLE alltypesorc_wrong(stimestamp1 string) STORED AS ORC PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE alltypesorc_wrong(stimestamp1 string) STORED AS ORC POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_wrong POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] diff --git a/ql/src/test/results/clientpositive/view.q.out b/ql/src/test/results/clientpositive/view.q.out index 6f477cd..c45301d 100644 --- a/ql/src/test/results/clientpositive/view.q.out +++ b/ql/src/test/results/clientpositive/view.q.out @@ -9,32 +9,40 @@ POSTHOOK: type: SWITCHDATABASE PREHOOK: query: CREATE TABLE table1 (key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db1 POSTHOOK: query: CREATE TABLE table1 (key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db1 POSTHOOK: Output: db1@table1 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE table1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db1@table1 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE table1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db1@table1 PREHOOK: query: CREATE TABLE table2 (key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:db1 POSTHOOK: query: CREATE TABLE table2 (key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:db1 POSTHOOK: Output: db1@table2 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE table2 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: db1@table2 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE table2 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: db1@table2 PREHOOK: query: -- relative reference, no alias CREATE VIEW v1 AS SELECT * FROM table1 diff --git a/ql/src/test/results/clientpositive/view_cast.q.out b/ql/src/test/results/clientpositive/view_cast.q.out index f9788ce..37e33ff 100644 --- a/ql/src/test/results/clientpositive/view_cast.q.out +++ b/ql/src/test/results/clientpositive/view_cast.q.out @@ -4,21 +4,27 @@ POSTHOOK: query: DROP TABLE IF EXISTS atab POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE IF NOT EXISTS atab (ks_uid BIGINT, sr_uid STRING, sr_id STRING, tstamp STRING, m_id STRING, act STRING, at_sr_uid STRING, tstamp_type STRING, original_m_id STRING, original_tstamp STRING, registered_flag TINYINT, at_ks_uid BIGINT) PARTITIONED BY (dt STRING,nt STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE IF NOT EXISTS atab (ks_uid BIGINT, sr_uid STRING, sr_id STRING, tstamp STRING, m_id STRING, act STRING, at_sr_uid STRING, tstamp_type STRING, original_m_id STRING, original_tstamp STRING, registered_flag TINYINT, at_ks_uid BIGINT) PARTITIONED BY (dt STRING,nt STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@atab PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/v1.txt' INTO TABLE atab PARTITION (dt='20130312', nt='tw') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@atab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/v1.txt' INTO TABLE atab PARTITION (dt='20130312', nt='tw') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@atab POSTHOOK: Output: default@atab@dt=20130312/nt=tw PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/v1.txt' INTO TABLE atab PARTITION (dt='20130311', nt='tw') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@atab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/v1.txt' INTO TABLE atab PARTITION (dt='20130311', nt='tw') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@atab POSTHOOK: Output: default@atab@dt=20130311/nt=tw PREHOOK: query: DROP TABLE IF EXISTS mstab @@ -27,14 +33,18 @@ POSTHOOK: query: DROP TABLE IF EXISTS mstab POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE mstab(ks_uid INT, csc INT) PARTITIONED BY (dt STRING) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE mstab(ks_uid INT, csc INT) PARTITIONED BY (dt STRING) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@mstab PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/v2.txt' INTO TABLE mstab PARTITION (dt='20130311') PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@mstab POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/v2.txt' INTO TABLE mstab PARTITION (dt='20130311') POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@mstab POSTHOOK: Output: default@mstab@dt=20130311 PREHOOK: query: DROP VIEW IF EXISTS aa_view_tw diff --git a/ql/src/test/results/clientpositive/virtual_column.q.out b/ql/src/test/results/clientpositive/virtual_column.q.out index 4878cbd..c49277d 100644 --- a/ql/src/test/results/clientpositive/virtual_column.q.out +++ b/ql/src/test/results/clientpositive/virtual_column.q.out @@ -350,8 +350,10 @@ POSTHOOK: Input: default@src 97 val_97 PREHOOK: query: CREATE TABLE src_index_test_rc (key int, value string) STORED AS RCFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE src_index_test_rc (key int, value string) STORED AS RCFILE POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@src_index_test_rc PREHOOK: query: INSERT OVERWRITE TABLE src_index_test_rc SELECT * FROM src PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/windowing.q.out b/ql/src/test/results/clientpositive/windowing.q.out index 9934a72..e854adc 100644 --- a/ql/src/test/results/clientpositive/windowing.q.out +++ b/ql/src/test/results/clientpositive/windowing.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: -- 1. testWindowing select p_mfgr, p_name, p_size, @@ -1258,6 +1262,7 @@ r INT, dr INT, s DOUBLE) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- 25. testMultipleInserts3SWQs CREATE TABLE part_1( p_mfgr STRING, @@ -1267,6 +1272,7 @@ r INT, dr INT, s DOUBLE) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_1 PREHOOK: query: CREATE TABLE part_2( p_mfgr STRING, @@ -1278,6 +1284,7 @@ cud INT, s2 DOUBLE, fv1 INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part_2( p_mfgr STRING, p_name STRING, @@ -1288,6 +1295,7 @@ cud INT, s2 DOUBLE, fv1 INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_2 PREHOOK: query: CREATE TABLE part_3( p_mfgr STRING, @@ -1297,6 +1305,7 @@ c INT, ca INT, fv INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: CREATE TABLE part_3( p_mfgr STRING, p_name STRING, @@ -1305,6 +1314,7 @@ c INT, ca INT, fv INT) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part_3 PREHOOK: query: from part INSERT OVERWRITE TABLE part_1 diff --git a/ql/src/test/results/clientpositive/windowing_adjust_rowcontainer_sz.q.out b/ql/src/test/results/clientpositive/windowing_adjust_rowcontainer_sz.q.out index 0a15f68..ff407d6 100644 --- a/ql/src/test/results/clientpositive/windowing_adjust_rowcontainer_sz.q.out +++ b/ql/src/test/results/clientpositive/windowing_adjust_rowcontainer_sz.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: select p_mfgr, p_name, p_size, rank() over(distribute by p_mfgr sort by p_name) as r, diff --git a/ql/src/test/results/clientpositive/windowing_columnPruning.q.out b/ql/src/test/results/clientpositive/windowing_columnPruning.q.out index 91d6237..7535dd3 100644 --- a/ql/src/test/results/clientpositive/windowing_columnPruning.q.out +++ b/ql/src/test/results/clientpositive/windowing_columnPruning.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: -- 1. testQueryLevelPartitionColsNotInSelect select p_size, diff --git a/ql/src/test/results/clientpositive/windowing_expressions.q.out b/ql/src/test/results/clientpositive/windowing_expressions.q.out index e08d0bc..604c56c 100644 --- a/ql/src/test/results/clientpositive/windowing_expressions.q.out +++ b/ql/src/test/results/clientpositive/windowing_expressions.q.out @@ -15,6 +15,7 @@ CREATE TABLE part( p_comment STRING ) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, @@ -28,12 +29,15 @@ CREATE TABLE part( p_comment STRING ) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@part PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@part POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@part PREHOOK: query: drop table over10k PREHOOK: type: DROPTABLE @@ -54,6 +58,7 @@ PREHOOK: query: create table over10k( row format delimited fields terminated by '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table over10k( t tinyint, si smallint, @@ -69,12 +74,15 @@ POSTHOOK: query: create table over10k( row format delimited fields terminated by '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@over10k PREHOOK: query: load data local inpath '../../data/files/over10k' into table over10k PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@over10k POSTHOOK: query: load data local inpath '../../data/files/over10k' into table over10k POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@over10k PREHOOK: query: select p_mfgr, p_retailprice, p_size, round(sum(p_retailprice) over w1 , 2) = round(sum(lag(p_retailprice,1,0.0)) over w1 + last_value(p_retailprice) over w1 , 2), @@ -663,14 +671,18 @@ Manufacturer#5 1534.532 PREHOOK: query: -- multi table insert test create table t1 (a1 int, b1 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- multi table insert test create table t1 (a1 int, b1 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create table t2 (a1 int, b1 string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table t2 (a1 int, b1 string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@t2 PREHOOK: query: from (select sum(i) over (partition by ts order by i), s from over10k) tt insert overwrite table t1 select * insert overwrite table t2 select * PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/windowing_multipartitioning.q.out b/ql/src/test/results/clientpositive/windowing_multipartitioning.q.out index 6472921..c682790 100644 --- a/ql/src/test/results/clientpositive/windowing_multipartitioning.q.out +++ b/ql/src/test/results/clientpositive/windowing_multipartitioning.q.out @@ -17,6 +17,7 @@ PREHOOK: query: create table over10k( row format delimited fields terminated by '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table over10k( t tinyint, si smallint, @@ -32,12 +33,15 @@ POSTHOOK: query: create table over10k( row format delimited fields terminated by '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@over10k PREHOOK: query: load data local inpath '../../data/files/over10k' into table over10k PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@over10k POSTHOOK: query: load data local inpath '../../data/files/over10k' into table over10k POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@over10k PREHOOK: query: select s, rank() over (partition by s order by si), sum(b) over (partition by s order by si) from over10k limit 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/windowing_navfn.q.out b/ql/src/test/results/clientpositive/windowing_navfn.q.out index 4fff8fe..b2038d2 100644 --- a/ql/src/test/results/clientpositive/windowing_navfn.q.out +++ b/ql/src/test/results/clientpositive/windowing_navfn.q.out @@ -17,6 +17,7 @@ PREHOOK: query: create table over10k( row format delimited fields terminated by '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table over10k( t tinyint, si smallint, @@ -32,12 +33,15 @@ POSTHOOK: query: create table over10k( row format delimited fields terminated by '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@over10k PREHOOK: query: load data local inpath '../../data/files/over10k' into table over10k PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@over10k POSTHOOK: query: load data local inpath '../../data/files/over10k' into table over10k POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@over10k PREHOOK: query: select s, row_number() over (partition by d order by dec) from over10k limit 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/windowing_ntile.q.out b/ql/src/test/results/clientpositive/windowing_ntile.q.out index 7d95db7..8333629 100644 --- a/ql/src/test/results/clientpositive/windowing_ntile.q.out +++ b/ql/src/test/results/clientpositive/windowing_ntile.q.out @@ -17,6 +17,7 @@ PREHOOK: query: create table over10k( row format delimited fields terminated by '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table over10k( t tinyint, si smallint, @@ -32,12 +33,15 @@ POSTHOOK: query: create table over10k( row format delimited fields terminated by '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@over10k PREHOOK: query: load data local inpath '../../data/files/over10k' into table over10k PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@over10k POSTHOOK: query: load data local inpath '../../data/files/over10k' into table over10k POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@over10k PREHOOK: query: select i, ntile(10) over (partition by s order by i) from over10k limit 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/windowing_rank.q.out b/ql/src/test/results/clientpositive/windowing_rank.q.out index ac11897..9976fdb 100644 --- a/ql/src/test/results/clientpositive/windowing_rank.q.out +++ b/ql/src/test/results/clientpositive/windowing_rank.q.out @@ -17,6 +17,7 @@ PREHOOK: query: create table over10k( row format delimited fields terminated by '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table over10k( t tinyint, si smallint, @@ -32,12 +33,15 @@ POSTHOOK: query: create table over10k( row format delimited fields terminated by '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@over10k PREHOOK: query: load data local inpath '../../data/files/over10k' into table over10k PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@over10k POSTHOOK: query: load data local inpath '../../data/files/over10k' into table over10k POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@over10k PREHOOK: query: select s, rank() over (partition by f order by t) from over10k limit 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/windowing_udaf.q.out b/ql/src/test/results/clientpositive/windowing_udaf.q.out index 3231354..f109dd2 100644 --- a/ql/src/test/results/clientpositive/windowing_udaf.q.out +++ b/ql/src/test/results/clientpositive/windowing_udaf.q.out @@ -17,6 +17,7 @@ PREHOOK: query: create table over10k( row format delimited fields terminated by '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table over10k( t tinyint, si smallint, @@ -32,12 +33,15 @@ POSTHOOK: query: create table over10k( row format delimited fields terminated by '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@over10k PREHOOK: query: load data local inpath '../../data/files/over10k' into table over10k PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@over10k POSTHOOK: query: load data local inpath '../../data/files/over10k' into table over10k POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@over10k PREHOOK: query: select s, min(i) over (partition by s) from over10k limit 100 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/windowing_windowspec.q.out b/ql/src/test/results/clientpositive/windowing_windowspec.q.out index 9d05548..6ea068c 100644 --- a/ql/src/test/results/clientpositive/windowing_windowspec.q.out +++ b/ql/src/test/results/clientpositive/windowing_windowspec.q.out @@ -17,6 +17,7 @@ PREHOOK: query: create table over10k( row format delimited fields terminated by '|' PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table over10k( t tinyint, si smallint, @@ -32,12 +33,15 @@ POSTHOOK: query: create table over10k( row format delimited fields terminated by '|' POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@over10k PREHOOK: query: load data local inpath '../../data/files/over10k' into table over10k PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@over10k POSTHOOK: query: load data local inpath '../../data/files/over10k' into table over10k POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@over10k PREHOOK: query: select s, sum(b) over (partition by i order by s,b rows unbounded preceding) from over10k limit 100 PREHOOK: type: QUERY