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 67a3aa7..cff0410 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 @@ -745,6 +745,8 @@ private void analyzeCreateDatabase(ASTNode ast) throws SemanticException { if (dbProps != null) { createDatabaseDesc.setDatabaseProperties(dbProps); } + Database database = new Database(dbName, dbComment, dbLocation, dbProps); + outputs.add(new WriteEntity(database, WriteEntity.WriteType.DDL_NO_LOCK)); rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(), createDatabaseDesc), conf)); @@ -795,8 +797,12 @@ private void analyzeDropDatabase(ASTNode ast) throws SemanticException { rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(), dropDatabaseDesc), conf)); } - private void analyzeSwitchDatabase(ASTNode ast) { + private void analyzeSwitchDatabase(ASTNode ast) throws SemanticException { String dbName = unescapeIdentifier(ast.getChild(0).getText()); + Database database = getDatabase(dbName, true); + ReadEntity dbReadEntity = new ReadEntity(database); + dbReadEntity.noLockNeeded(); + inputs.add(dbReadEntity); SwitchDatabaseDesc switchDatabaseDesc = new SwitchDatabaseDesc(dbName); rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(), switchDatabaseDesc), conf)); @@ -812,7 +818,7 @@ private void analyzeDropTable(ASTNode ast, boolean expectView) // configured not to fail silently boolean throwException = !ifExists && !HiveConf.getBoolVar(conf, ConfVars.DROPIGNORESNONEXISTENT); - Table tab = getTable(tableName, throwException); + Table tab = getTableWithQN(tableName, throwException); if (tab != null) { inputs.add(new ReadEntity(tab)); outputs.add(new WriteEntity(tab, WriteEntity.WriteType.DDL_EXCLUSIVE)); @@ -1080,7 +1086,7 @@ private void analyzeCreateIndex(ASTNode ast) throws SemanticException { } storageFormat.fillDefaultStorageFormat(); - + inputs.add(new ReadEntity(getTableWithQN(tableName, true))); CreateIndexDesc crtIndexDesc = new CreateIndexDesc(tableName, indexName, indexedCols, indexTableName, deferredRebuild, storageFormat.getInputFormat(), @@ -1110,6 +1116,8 @@ private void analyzeDropIndex(ASTNode ast) throws SemanticException { } } + inputs.add(new ReadEntity(getTableWithQN(tableName, true))); + DropIndexDesc dropIdxDesc = new DropIndexDesc(indexName, tableName); rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(), dropIdxDesc), conf)); 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 a6a0aee..bd7102f 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 @@ -10163,6 +10163,7 @@ private ASTNode analyzeCreateTable(ASTNode ast, QB qb) String dbName = qualified.length == 1 ? SessionState.get().getCurrentDatabase() : qualified[0]; Database database = getDatabase(dbName); outputs.add(new WriteEntity(database, WriteEntity.WriteType.DDL_SHARED)); + outputs.add(new WriteEntity(new Table(dbName, tableName), WriteEntity.WriteType.DDL_NO_LOCK)); if (isTemporary) { if (partCols.size() > 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 6a447ea..6acf11c 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 @@ -27,7 +27,7 @@ IMPORT("IMPORT", null, new Privilege[]{Privilege.ALTER_METADATA, Privilege.ALTER_DATA}), CREATEDATABASE("CREATEDATABASE", null, new Privilege[]{Privilege.CREATE}), DROPDATABASE("DROPDATABASE", null, new Privilege[]{Privilege.DROP}), - SWITCHDATABASE("SWITCHDATABASE", new Privilege[]{Privilege.SELECT}, null), + SWITCHDATABASE("SWITCHDATABASE", null, null), LOCKDB("LOCKDATABASE", new Privilege[]{Privilege.LOCK}, null), UNLOCKDB("UNLOCKDATABASE", new Privilege[]{Privilege.LOCK}, null), DROPTABLE ("DROPTABLE", null, new Privilege[]{Privilege.DROP}), 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 4a3d8a7..e3542e4 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 @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType; import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject; import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject.HivePrivObjectActionType; +import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject.HivePrivilegeObjectType; /** * Mapping of operation to its required input and output privileges @@ -43,6 +44,7 @@ // The following fields specify the criteria on objects for this priv to be required private final IOType ioType; private final HivePrivObjectActionType actionType; + private final HivePrivilegeObjectType objectType; private PrivRequirement(SQLPrivTypeGrant[] privs, IOType ioType) { @@ -51,11 +53,22 @@ private PrivRequirement(SQLPrivTypeGrant[] privs, IOType ioType) { private PrivRequirement(SQLPrivTypeGrant[] privs, IOType ioType, HivePrivObjectActionType actionType) { + this(privs, ioType, actionType, null); + } + + private PrivRequirement(SQLPrivTypeGrant[] privs, HivePrivilegeObjectType objectType) { + this(privs, null, null, objectType); + } + + private PrivRequirement(SQLPrivTypeGrant[] privs, IOType ioType, + HivePrivObjectActionType actionType, HivePrivilegeObjectType objectType) { this.reqPrivs = privs; this.ioType = ioType; this.actionType = actionType; + this.objectType = objectType; } + /** * Utility function that takes a input and output privilege objects * @param inGrant @@ -70,6 +83,15 @@ private PrivRequirement(SQLPrivTypeGrant[] privs, IOType ioType, return privReqs; } + /** + * Utility function that converts PrivRequirement array into list + * @param privs + * @return + */ + static List newPrivRequirementList(PrivRequirement... privs) { + return new ArrayList(Arrays.asList(privs)); + } + private SQLPrivTypeGrant[] getReqPrivs() { return reqPrivs; } @@ -82,6 +104,10 @@ private HivePrivObjectActionType getActionType() { return actionType; } + public HivePrivilegeObjectType getObjectType() { + return objectType; + } + } private static Map> op2Priv; @@ -107,9 +133,9 @@ private HivePrivObjectActionType getActionType() { (SEL_NOGRANT_AR, SEL_NOGRANT_AR)); //?? - op2Priv.put(HiveOperationType.CREATEDATABASE, - PrivRequirement.newIOPrivRequirement -(ADMIN_PRIV_AR, OWNER_INS_SEL_DEL_NOGRANT_AR)); + op2Priv.put(HiveOperationType.CREATEDATABASE, PrivRequirement.newPrivRequirementList( + new PrivRequirement(OWNER_INS_SEL_DEL_NOGRANT_AR, HivePrivilegeObjectType.DFS_URI), + new PrivRequirement(OWNER_INS_SEL_DEL_NOGRANT_AR, HivePrivilegeObjectType.LOCAL_URI))); op2Priv.put(HiveOperationType.DROPDATABASE, PrivRequirement.newIOPrivRequirement (null, OWNER_PRIV_AR)); @@ -300,9 +326,9 @@ private HivePrivObjectActionType getActionType() { (null, null)); // require db ownership, if there is a file require SELECT , INSERT, and DELETE - op2Priv.put(HiveOperationType.CREATETABLE, - PrivRequirement.newIOPrivRequirement -(OWNER_INS_SEL_DEL_NOGRANT_AR, OWNER_PRIV_AR)); + op2Priv.put(HiveOperationType.CREATETABLE, PrivRequirement.newPrivRequirementList( + new PrivRequirement(OWNER_INS_SEL_DEL_NOGRANT_AR, IOType.INPUT), + new PrivRequirement(OWNER_PRIV_AR, HivePrivilegeObjectType.DATABASE))); op2Priv.put(HiveOperationType.ALTERDATABASE, PrivRequirement.newIOPrivRequirement (null, ADMIN_PRIV_AR)); @@ -388,20 +414,17 @@ public static RequiredPrivileges getRequiredPrivs(HiveOperationType hiveOpType, List opPrivs = op2Priv.get(hiveOpType); RequiredPrivileges reqPrivs = new RequiredPrivileges(); - // Find the PrivRequirements that match on IOType and ActionType, and add - // the privilege - // required to reqPrivs + // Find the PrivRequirements that match on IOType, ActionType, and HivePrivilegeObjectType add + // the privilege required to reqPrivs for (PrivRequirement opPriv : opPrivs) { - if (opPriv.getIOType() != ioType) { + if (opPriv.getIOType() != null && opPriv.getIOType() != ioType) { + continue; + } + if (opPriv.getActionType() != null && opPriv.getActionType() != hObj.getActionType()) { continue; } - if (opPriv.getActionType() != null) { - // if action in PrivRequirement is null, it means that - // the privileges are required irrespective of hObj's action type - // If it is not null, action type has to match - if (hObj.getActionType() != opPriv.getActionType()) { - continue; - } + if (opPriv.getObjectType() != null && opPriv.getObjectType() != hObj.getType()) { + continue; } reqPrivs.addAll(opPriv.getReqPrivs()); } 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 83a0b45..9ceac0c 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 @@ -94,6 +94,11 @@ private void checkPrivileges(HiveOperationType hiveOpType, List, 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 5471cba..5aa4ae6 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 @@ -15,6 +15,7 @@ PREHOOK: query: CREATE TABLE UserVisits_web_text_none ( row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@UserVisits_web_text_none POSTHOOK: query: CREATE TABLE UserVisits_web_text_none ( sourceIP string, destURL string, 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 3be6320..298e5e4 100644 --- a/ql/src/test/results/clientnegative/compute_stats_long.q.out +++ b/ql/src/test/results/clientnegative/compute_stats_long.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table tab_int(a int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tab_int POSTHOOK: query: create table tab_int(a int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 5f80270..931f2a7 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 @@ -7,6 +7,7 @@ PREHOOK: query: create table aa ( test STRING ) WITH SERDEPROPERTIES ("input.regex" = "[^\\](.*)", "output.format.string" = "$1s") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@aa 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 e1c9a0c..5609590 100644 --- a/ql/src/test/results/clientnegative/create_view_failure1.q.out +++ b/ql/src/test/results/clientnegative/create_view_failure1.q.out @@ -6,6 +6,7 @@ PREHOOK: query: -- views and tables share the same namespace CREATE TABLE xxx12(key int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@xxx12 POSTHOOK: query: -- views and tables share the same namespace CREATE TABLE xxx12(key int) POSTHOOK: type: CREATETABLE 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 6c8a26d..cfe318a 100644 --- a/ql/src/test/results/clientnegative/create_view_failure2.q.out +++ b/ql/src/test/results/clientnegative/create_view_failure2.q.out @@ -14,4 +14,5 @@ POSTHOOK: Output: default@xxx4 PREHOOK: query: CREATE TABLE xxx4(key int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@xxx4 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_create_already_exists.q.out b/ql/src/test/results/clientnegative/database_create_already_exists.q.out index 86aee91..74ca7c4 100644 --- a/ql/src/test/results/clientnegative/database_create_already_exists.q.out +++ b/ql/src/test/results/clientnegative/database_create_already_exists.q.out @@ -6,9 +6,12 @@ default PREHOOK: query: -- Try to create a database that already exists CREATE DATABASE test_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:test_db POSTHOOK: query: -- Try to create a database that already exists CREATE DATABASE test_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:test_db PREHOOK: query: CREATE DATABASE test_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:test_db FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Database test_db already exists diff --git a/ql/src/test/results/clientnegative/database_create_invalid_name.q.out b/ql/src/test/results/clientnegative/database_create_invalid_name.q.out index 8d42949..207cb07 100644 --- a/ql/src/test/results/clientnegative/database_create_invalid_name.q.out +++ b/ql/src/test/results/clientnegative/database_create_invalid_name.q.out @@ -6,4 +6,5 @@ default PREHOOK: query: -- Try to create a database with an invalid name CREATE DATABASE `test.db` PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:test.db FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidObjectException(message:test.db is not a valid database name) 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 db5b5a4..a750d02 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 @@ -6,24 +6,31 @@ default PREHOOK: query: -- Try to drop a non-empty database CREATE DATABASE test_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:test_db POSTHOOK: query: -- Try to drop a non-empty database CREATE DATABASE test_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:test_db PREHOOK: query: USE test_db PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:test_db POSTHOOK: query: USE test_db POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:test_db PREHOOK: query: CREATE TABLE t(a INT) PREHOOK: type: CREATETABLE PREHOOK: Output: database:test_db +PREHOOK: Output: test_db@t 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 +PREHOOK: Input: database:default POSTHOOK: query: USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: query: DROP DATABASE test_db PREHOOK: type: DROPDATABASE PREHOOK: Input: database:test_db 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 ebed9a4..167c862 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 @@ -6,24 +6,31 @@ default PREHOOK: query: -- Try to drop a non-empty database in restrict mode CREATE DATABASE db_drop_non_empty_restrict PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:db_drop_non_empty_restrict POSTHOOK: query: -- Try to drop a non-empty database in restrict mode CREATE DATABASE db_drop_non_empty_restrict POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:db_drop_non_empty_restrict PREHOOK: query: USE db_drop_non_empty_restrict PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:db_drop_non_empty_restrict POSTHOOK: query: USE db_drop_non_empty_restrict POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:db_drop_non_empty_restrict PREHOOK: query: CREATE TABLE t(a INT) PREHOOK: type: CREATETABLE PREHOOK: Output: database:db_drop_non_empty_restrict +PREHOOK: Output: db_drop_non_empty_restrict@t 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 +PREHOOK: Input: database:default POSTHOOK: query: USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: query: DROP DATABASE db_drop_non_empty_restrict PREHOOK: type: DROPDATABASE PREHOOK: Input: database:db_drop_non_empty_restrict diff --git a/ql/src/test/results/clientnegative/database_switch_does_not_exist.q.out b/ql/src/test/results/clientnegative/database_switch_does_not_exist.q.out index 1d640e3..2f2c0e3 100644 --- a/ql/src/test/results/clientnegative/database_switch_does_not_exist.q.out +++ b/ql/src/test/results/clientnegative/database_switch_does_not_exist.q.out @@ -3,7 +3,4 @@ PREHOOK: type: SHOWDATABASES POSTHOOK: query: SHOW DATABASES POSTHOOK: type: SHOWDATABASES default -PREHOOK: query: -- Try to switch to a database that does not exist -USE does_not_exist -PREHOOK: type: SWITCHDATABASE -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Database does not exist: does_not_exist +FAILED: SemanticException [Error 10072]: Database does not exist: does_not_exist diff --git a/ql/src/test/results/clientnegative/dbtxnmgr_nodblock.q.out b/ql/src/test/results/clientnegative/dbtxnmgr_nodblock.q.out index 4786679..b8bbe93 100644 --- a/ql/src/test/results/clientnegative/dbtxnmgr_nodblock.q.out +++ b/ql/src/test/results/clientnegative/dbtxnmgr_nodblock.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop database if exists drop_nodblock POSTHOOK: type: DROPDATABASE PREHOOK: query: create database drop_nodblock PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:drop_nodblock POSTHOOK: query: create database drop_nodblock POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:drop_nodblock PREHOOK: query: lock database drop_nodblock shared PREHOOK: type: LOCKDATABASE FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Current transaction manager does not support explicit lock requests. Transaction manager: org.apache.hadoop.hive.ql.lockmgr.DbTxnManager diff --git a/ql/src/test/results/clientnegative/dbtxnmgr_nodbunlock.q.out b/ql/src/test/results/clientnegative/dbtxnmgr_nodbunlock.q.out index 14abcaf..ea7a3eb 100644 --- a/ql/src/test/results/clientnegative/dbtxnmgr_nodbunlock.q.out +++ b/ql/src/test/results/clientnegative/dbtxnmgr_nodbunlock.q.out @@ -4,8 +4,10 @@ POSTHOOK: query: drop database if exists drop_nodbunlock POSTHOOK: type: DROPDATABASE PREHOOK: query: create database drop_nodbunlock PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:drop_nodbunlock POSTHOOK: query: create database drop_nodbunlock POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:drop_nodbunlock PREHOOK: query: unlock database drop_nodbunlock PREHOOK: type: UNLOCKDATABASE FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Current transaction manager does not support explicit lock requests. Transaction manager: org.apache.hadoop.hive.ql.lockmgr.DbTxnManager diff --git a/ql/src/test/results/clientnegative/dbtxnmgr_notablelock.q.out b/ql/src/test/results/clientnegative/dbtxnmgr_notablelock.q.out index 19aed99..3fad08c 100644 --- a/ql/src/test/results/clientnegative/dbtxnmgr_notablelock.q.out +++ b/ql/src/test/results/clientnegative/dbtxnmgr_notablelock.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table drop_notablelock (c int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@drop_notablelock POSTHOOK: query: create table drop_notablelock (c int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/dbtxnmgr_notableunlock.q.out b/ql/src/test/results/clientnegative/dbtxnmgr_notableunlock.q.out index 38b9d1e..2d9a20f 100644 --- a/ql/src/test/results/clientnegative/dbtxnmgr_notableunlock.q.out +++ b/ql/src/test/results/clientnegative/dbtxnmgr_notableunlock.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table drop_notableunlock (c int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@drop_notableunlock POSTHOOK: query: create table drop_notableunlock (c int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/ddltime.q.out b/ql/src/test/results/clientnegative/ddltime.q.out index e18eed9..25d9af6 100644 --- a/ql/src/test/results/clientnegative/ddltime.q.out +++ b/ql/src/test/results/clientnegative/ddltime.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table T2 like srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@T2 POSTHOOK: query: create table T2 like srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/decimal_precision.q.out b/ql/src/test/results/clientnegative/decimal_precision.q.out index 212cebf..de53284 100644 --- a/ql/src/test/results/clientnegative/decimal_precision.q.out +++ b/ql/src/test/results/clientnegative/decimal_precision.q.out @@ -8,6 +8,7 @@ ROW FORMAT DELIMITED STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@DECIMAL_PRECISION POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' 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 6edd570..2b59b38 100644 --- a/ql/src/test/results/clientnegative/decimal_precision_1.q.out +++ b/ql/src/test/results/clientnegative/decimal_precision_1.q.out @@ -8,6 +8,7 @@ ROW FORMAT DELIMITED STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@DECIMAL_PRECISION POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' 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 588b818..f0add0a 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,7 @@ PREHOOK: query: create table default_partition_name (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@default_partition_name POSTHOOK: query: create table default_partition_name (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/deletejar.q.out b/ql/src/test/results/clientnegative/deletejar.q.out index 91560ee..d52186b 100644 --- a/ql/src/test/results/clientnegative/deletejar.q.out +++ b/ql/src/test/results/clientnegative/deletejar.q.out @@ -1,4 +1,5 @@ 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 +PREHOOK: Output: default@DELETEJAR 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 4b505c2..ce77731 100644 --- a/ql/src/test/results/clientnegative/desc_failure3.q.out +++ b/ql/src/test/results/clientnegative/desc_failure3.q.out @@ -1,12 +1,16 @@ PREHOOK: query: CREATE DATABASE db1 PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:db1 POSTHOOK: query: CREATE DATABASE db1 POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:db1 PREHOOK: query: CREATE TABLE db1.t1(key1 INT, value1 STRING) PARTITIONED BY (ds STRING, part STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:db1 +PREHOOK: Output: db1@db1.t1 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@db1.t1 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 714183c..8fee4e1 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 @@ -10,6 +10,7 @@ POSTHOOK: Input: default@src PREHOOK: query: CREATE TABLE test_table123 (a INT, b MAP) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@test_table123 POSTHOOK: query: CREATE TABLE test_table123 (a INT, b MAP) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 090d427..c32efa6 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 @@ -10,6 +10,7 @@ POSTHOOK: Input: default@src PREHOOK: query: CREATE TABLE test_table123 (a INT, b STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@test_table123 POSTHOOK: query: CREATE TABLE test_table123 (a INT, b STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 cde0abb..67f0a08 100644 --- a/ql/src/test/results/clientnegative/drop_partition_failure.q.out +++ b/ql/src/test/results/clientnegative/drop_partition_failure.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table mp (a string) partitioned by (b string, c string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@mp POSTHOOK: query: create table mp (a string) partitioned by (b string, c string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 c4f533b..b1bf8d4 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,6 +1,7 @@ PREHOOK: query: create table ptestfilter1 (a string, b int) partitioned by (c string, d string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@ptestfilter1 POSTHOOK: query: create table ptestfilter1 (a string, b int) partitioned by (c string, d string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 9c1ff79..3dfa2bc 100644 --- a/ql/src/test/results/clientnegative/drop_table_failure3.q.out +++ b/ql/src/test/results/clientnegative/drop_table_failure3.q.out @@ -1,14 +1,19 @@ PREHOOK: query: create database dtf3 PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:dtf3 POSTHOOK: query: create database dtf3 POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:dtf3 PREHOOK: query: use dtf3 PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:dtf3 POSTHOOK: query: use dtf3 POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:dtf3 PREHOOK: query: create table drop_table_failure_temp(col STRING) partitioned by (p STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:dtf3 +PREHOOK: Output: dtf3@drop_table_failure_temp POSTHOOK: query: create table drop_table_failure_temp(col STRING) partitioned by (p STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:dtf3 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 3a0038d..f954ac7 100644 --- a/ql/src/test/results/clientnegative/drop_view_failure1.q.out +++ b/ql/src/test/results/clientnegative/drop_view_failure1.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE xxx1(key int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@xxx1 POSTHOOK: query: CREATE TABLE xxx1(key int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/duplicate_insert1.q.out b/ql/src/test/results/clientnegative/duplicate_insert1.q.out index da654e3..79f3bd4 100644 --- a/ql/src/test/results/clientnegative/duplicate_insert1.q.out +++ b/ql/src/test/results/clientnegative/duplicate_insert1.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table dest1_din1(key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1_din1 POSTHOOK: query: create table dest1_din1(key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/duplicate_insert2.q.out b/ql/src/test/results/clientnegative/duplicate_insert2.q.out index 9ff815f..71f8d91 100644 --- a/ql/src/test/results/clientnegative/duplicate_insert2.q.out +++ b/ql/src/test/results/clientnegative/duplicate_insert2.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table dest1_din2(key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1_din2 POSTHOOK: query: create table dest1_din2(key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/dyn_part1.q.out b/ql/src/test/results/clientnegative/dyn_part1.q.out index 54d981f..62d01fb 100644 --- a/ql/src/test/results/clientnegative/dyn_part1.q.out +++ b/ql/src/test/results/clientnegative/dyn_part1.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table dynamic_partition (key string) partitioned by (value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dynamic_partition POSTHOOK: query: create table dynamic_partition (key string) partitioned by (value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/dyn_part2.q.out b/ql/src/test/results/clientnegative/dyn_part2.q.out index da6c8c6..f2b6b44 100644 --- a/ql/src/test/results/clientnegative/dyn_part2.q.out +++ b/ql/src/test/results/clientnegative/dyn_part2.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table nzhang_part1 (key string, value string) partitioned by (ds string, hr string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@nzhang_part1 POSTHOOK: query: create table nzhang_part1 (key string, value string) partitioned by (ds string, hr string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/dyn_part3.q.out b/ql/src/test/results/clientnegative/dyn_part3.q.out index 658ce5f..b9f1442 100644 --- a/ql/src/test/results/clientnegative/dyn_part3.q.out +++ b/ql/src/test/results/clientnegative/dyn_part3.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table nzhang_part( key string) partitioned by (value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@nzhang_part POSTHOOK: query: create table nzhang_part( key string) partitioned by (value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/dyn_part4.q.out b/ql/src/test/results/clientnegative/dyn_part4.q.out index 3d81c88..69c3f85 100644 --- a/ql/src/test/results/clientnegative/dyn_part4.q.out +++ b/ql/src/test/results/clientnegative/dyn_part4.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table nzhang_part4 (key string) partitioned by (ds string, hr string, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@nzhang_part4 POSTHOOK: query: create table nzhang_part4 (key string) partitioned by (ds string, hr string, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 000521f..dd5e8e9 100644 --- a/ql/src/test/results/clientnegative/dyn_part_max.q.out +++ b/ql/src/test/results/clientnegative/dyn_part_max.q.out @@ -1,13 +1,16 @@ PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:default POSTHOOK: query: USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: 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) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@max_parts 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 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 4a46354..b8c21ed 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 @@ -1,12 +1,15 @@ PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:default POSTHOOK: query: USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default 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 +PREHOOK: Output: default@max_parts POSTHOOK: query: -- Test of hive.exec.max.dynamic.partitions.pernode CREATE TABLE max_parts(key STRING) PARTITIONED BY (value STRING) 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 90e32f8..f069ae8 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,6 +1,7 @@ PREHOOK: query: create table source_table like srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@source_table POSTHOOK: query: create table source_table like srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ POSTHOOK: Output: default@source_table PREHOOK: query: create table dest_table like srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_table POSTHOOK: query: create table dest_table like srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 716fb8a..f4c06f9 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,6 +1,7 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@exchange_part_test2 POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 dc10527..48adc04 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,6 +1,7 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@exchange_part_test2 POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 219b712..3a78201 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,6 +1,7 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@exchange_part_test2 POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 90a81e1..8655a25 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,6 +1,7 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@exchange_part_test2 POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 0e7f535..6757e60 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,6 +1,7 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@exchange_part_test2 POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 64e731f..43ea9d7 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,6 +1,7 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 7cdf556..f3194ce 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,6 +1,7 @@ PREHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exchange_part_test1 POSTHOOK: query: CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@exchange_part_test2 POSTHOOK: query: CREATE TABLE exchange_part_test2 (f1 string, f2 string) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 03940dc..03515ea 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") 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 3f30f34..7442b1b 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,17 +37,22 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: create table exim_department ( dep_id int comment "department identifier") stored as textfile tblproperties("maker"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department identifier") stored as textfile tblproperties("maker"="krishna") 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 2bac0b2..3c05600 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 @@ -5,6 +5,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_employee 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") @@ -82,12 +83,16 @@ POSTHOOK: Input: default@exim_employee POSTHOOK: Output: default@exim_employee PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: 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") @@ -95,6 +100,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("maker"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_employee 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") 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 45c6206..b61c38c 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,17 +37,22 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: create table exim_department ( dep_key int comment "department id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_key int comment "department id") stored as textfile tblproperties("creator"="krishna") 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 23858ef..f8f5ea7 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,17 +37,22 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: create table exim_department ( dep_id int comment "department id", dep_name string) stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id", dep_name string) stored as textfile tblproperties("creator"="krishna") 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 2a8e43a..f118aa7 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,17 +37,22 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: create table exim_department ( dep_id bigint comment "department id") stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id bigint comment "department id") stored as textfile tblproperties("creator"="krishna") 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 b0012c8..4b0fbdb 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,17 +37,22 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer 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 +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as rcfile tblproperties("creator"="krishna") 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 be6782e..2c63d1b 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,12 +37,16 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: 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" @@ -50,6 +55,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department 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" 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 2a7ecce..6098ad5 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,18 +37,23 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: 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") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department 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 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 e4c835b..e3cc024 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,12 +37,16 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: 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") @@ -52,6 +57,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department 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") 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 4107301..8dc3df0 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,18 +37,23 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: create table exim_department ( dep_id int comment "department id") clustered by (dep_id) into 10 buckets stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") clustered by (dep_id) into 10 buckets stored as textfile 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 fa6c9c5..9220c8e 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 @@ -4,6 +4,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department 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 @@ -38,18 +39,23 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: 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") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department 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 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 76e3ee6..5da4daa 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 @@ -4,6 +4,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department 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" 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 e719442..d820643 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,17 +37,22 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer 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 +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored by "org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler" tblproperties("creator"="krishna") 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 b79ca01..da116ef 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,18 +37,23 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_org string) stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_org string) stored as textfile 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 b063fa7..dfbf025 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 @@ -4,6 +4,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_org string) stored as textfile @@ -39,17 +40,22 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer 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 +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") 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 249ac3e..4cb6ca7 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 @@ -4,6 +4,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_org string) stored as textfile @@ -39,18 +40,23 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_mgr string) stored as textfile tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") partitioned by (dep_mgr string) stored as textfile 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 893ad6d..23caa4a 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 @@ -5,6 +5,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_employee 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") @@ -82,10 +83,14 @@ POSTHOOK: Input: default@exim_employee POSTHOOK: Output: default@exim_employee PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer FAILED: SemanticException [Error 10006]: Partition not found - Specified partition not found in import directory 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 893ad6d..23caa4a 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 @@ -5,6 +5,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_employee 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") @@ -82,10 +83,14 @@ POSTHOOK: Input: default@exim_employee POSTHOOK: Output: default@exim_employee PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer FAILED: SemanticException [Error 10006]: Partition not found - Specified partition not found in import directory 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 aa68e26..763efb2 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,17 +37,22 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer 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 +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") 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 fd4a418..77d58cb 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 @@ -3,6 +3,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile tblproperties("creator"="krishna") @@ -36,12 +37,16 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer #### A masked pattern was here #### PREHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile @@ -50,6 +55,7 @@ PREHOOK: query: create table exim_department ( dep_id int comment "department id PREHOOK: type: CREATETABLE #### A masked pattern was here #### PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int comment "department id") stored as textfile location 'ql/test/data/tablestore/exim_department' 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 2ce5f1e..fd27f29 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 @@ -5,6 +5,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_employee 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") @@ -82,12 +83,16 @@ POSTHOOK: Input: default@exim_employee POSTHOOK: Output: default@exim_employee PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: 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") @@ -95,6 +100,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_employee 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") 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 c7b9c49..2dfe38e 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,6 +1,7 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 c6fb9de..4e65479 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,6 +1,7 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -32,15 +33,20 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:importer 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 945d3d2..1a9a34d 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 @@ -5,6 +5,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_employee 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") @@ -43,12 +44,16 @@ POSTHOOK: Input: default@exim_employee POSTHOOK: Output: default@exim_employee PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: 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") @@ -56,6 +61,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_employee 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") 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 e606d72..d38b7fd 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,6 +1,7 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -32,10 +33,14 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer Authorization failed:No privilege 'Create' found for outputs { database:importer}. Use SHOW GRANT to get more details. diff --git a/ql/src/test/results/clientnegative/external1.q.out b/ql/src/test/results/clientnegative/external1.q.out index 696beaa..c583627 100644 --- a/ql/src/test/results/clientnegative/external1.q.out +++ b/ql/src/test/results/clientnegative/external1.q.out @@ -2,4 +2,5 @@ PREHOOK: type: CREATETABLE #### A masked pattern was here #### PREHOOK: Output: database:default +PREHOOK: Output: default@external1 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 a604885..4fc7c11 100644 --- a/ql/src/test/results/clientnegative/external2.q.out +++ b/ql/src/test/results/clientnegative/external2.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create external table external2(a int, b int) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@external2 POSTHOOK: query: create external table external2(a int, b int) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/fetchtask_ioexception.q.out b/ql/src/test/results/clientnegative/fetchtask_ioexception.q.out index 2d84b1c..f5b0b5d 100644 --- a/ql/src/test/results/clientnegative/fetchtask_ioexception.q.out +++ b/ql/src/test/results/clientnegative/fetchtask_ioexception.q.out @@ -3,6 +3,7 @@ PREHOOK: query: CREATE TABLE fetchtask_ioexception ( VALUE STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@fetchtask_ioexception POSTHOOK: query: CREATE TABLE fetchtask_ioexception ( KEY STRING, VALUE STRING) STORED AS SEQUENCEFILE 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 6c51c1d..6043258 100644 --- a/ql/src/test/results/clientnegative/fileformat_void_input.q.out +++ b/ql/src/test/results/clientnegative/fileformat_void_input.q.out @@ -3,6 +3,7 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS INPUTFORMAT 'java.lang.Void' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat' 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 8de35cc..fdf4428 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,7 @@ 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 +PREHOOK: Output: default@dest1 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 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 445e17d..b219fe6 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,7 @@ 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 +PREHOOK: Output: default@dest_g2 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 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 e066224..3c5506b 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,7 @@ 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 +PREHOOK: Output: default@dest1 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 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 e066224..3c5506b 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,7 @@ 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 +PREHOOK: Output: default@dest1 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 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 5980f26..912b8d3 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,7 @@ PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@T1 POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 e216778..8290d4c 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,7 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@T1 POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 e216778..8290d4c 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,7 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@T1 POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 158c50d..815f04f 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,7 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@T1 POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 a9c0665..4a595cb 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,7 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@T1 POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 a9c0665..4a595cb 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,7 @@ PREHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@T1 POSTHOOK: query: CREATE TABLE T1(a STRING, b STRING, c STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 510e8b4..a2f399a 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,7 @@ 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 +PREHOOK: Output: default@T1 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 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 4adfc97..226de5a 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,7 @@ 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 +PREHOOK: Output: default@T1 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 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 0d02acc..fce549b 100644 --- a/ql/src/test/results/clientnegative/illegal_partition_type.q.out +++ b/ql/src/test/results/clientnegative/illegal_partition_type.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@tab1 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 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 aec0fa1..3442d99 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,7 @@ 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 +PREHOOK: Output: default@tab1 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 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 7386258..cb2173a 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,7 @@ PREHOOK: query: create table tab1(c int) partitioned by (i int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tab1 POSTHOOK: query: create table tab1(c int) partitioned by (i int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 fe90afb..e388086 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,7 @@ PREHOOK: query: create table tab1(s string) PARTITIONED BY(dt date, st string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tab1 POSTHOOK: query: create table tab1(s string) PARTITIONED BY(dt date, st string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/index_bitmap_no_map_aggr.q.out b/ql/src/test/results/clientnegative/index_bitmap_no_map_aggr.q.out index 31cada1..b29d3a6 100644 --- a/ql/src/test/results/clientnegative/index_bitmap_no_map_aggr.q.out +++ b/ql/src/test/results/clientnegative/index_bitmap_no_map_aggr.q.out @@ -12,7 +12,9 @@ STAGE PLANS: PREHOOK: query: CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX +PREHOOK: Input: default@src POSTHOOK: query: CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@src POSTHOOK: Output: default@default__src_src1_index__ FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: org.apache.hadoop.hive.ql.metadata.HiveException: Cannot construct index without map-side aggregation diff --git a/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out b/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out index 85614ca..b65f94e 100644 --- a/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out +++ b/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out @@ -1,11 +1,15 @@ PREHOOK: query: drop index src_index on src PREHOOK: type: DROPINDEX +PREHOOK: Input: default@src POSTHOOK: query: drop index src_index on src POSTHOOK: type: DROPINDEX +POSTHOOK: Input: default@src PREHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX +PREHOOK: Input: default@src POSTHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@src POSTHOOK: Output: default@default__src_src_index__ PREHOOK: query: ALTER INDEX src_index ON src REBUILD PREHOOK: type: ALTERINDEX_REBUILD diff --git a/ql/src/test/results/clientnegative/index_compact_size_limit.q.out b/ql/src/test/results/clientnegative/index_compact_size_limit.q.out index 7c6bb0a..299cc47 100644 --- a/ql/src/test/results/clientnegative/index_compact_size_limit.q.out +++ b/ql/src/test/results/clientnegative/index_compact_size_limit.q.out @@ -1,11 +1,15 @@ PREHOOK: query: drop index src_index on src PREHOOK: type: DROPINDEX +PREHOOK: Input: default@src POSTHOOK: query: drop index src_index on src POSTHOOK: type: DROPINDEX +POSTHOOK: Input: default@src PREHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX +PREHOOK: Input: default@src POSTHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@src POSTHOOK: Output: default@default__src_src_index__ PREHOOK: query: ALTER INDEX src_index ON src REBUILD PREHOOK: type: ALTERINDEX_REBUILD diff --git a/ql/src/test/results/clientnegative/insert_into1.q.out b/ql/src/test/results/clientnegative/insert_into1.q.out index 4bfbc98..066f04d 100644 --- a/ql/src/test/results/clientnegative/insert_into1.q.out +++ b/ql/src/test/results/clientnegative/insert_into1.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into1_neg (key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@insert_into1_neg POSTHOOK: query: CREATE TABLE insert_into1_neg (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/insert_into2.q.out b/ql/src/test/results/clientnegative/insert_into2.q.out index 845d041..b839efe 100644 --- a/ql/src/test/results/clientnegative/insert_into2.q.out +++ b/ql/src/test/results/clientnegative/insert_into2.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into1_neg (key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@insert_into1_neg POSTHOOK: query: CREATE TABLE insert_into1_neg (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/insert_into3.q.out b/ql/src/test/results/clientnegative/insert_into3.q.out index baa6d5b..91aeb5b 100644 --- a/ql/src/test/results/clientnegative/insert_into3.q.out +++ b/ql/src/test/results/clientnegative/insert_into3.q.out @@ -6,6 +6,7 @@ PREHOOK: query: CREATE TABLE insert_into3_neg (key int, value string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@insert_into3_neg POSTHOOK: query: CREATE TABLE insert_into3_neg (key int, value string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientnegative/insert_into4.q.out b/ql/src/test/results/clientnegative/insert_into4.q.out index 4e7c6fc..303fb6a 100644 --- a/ql/src/test/results/clientnegative/insert_into4.q.out +++ b/ql/src/test/results/clientnegative/insert_into4.q.out @@ -6,6 +6,7 @@ PREHOOK: query: CREATE TABLE insert_into3_neg (key int, value string) PARTITIONED BY (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@insert_into3_neg POSTHOOK: query: CREATE TABLE insert_into3_neg (key int, value string) PARTITIONED BY (ds string) POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientnegative/insert_into5.q.out b/ql/src/test/results/clientnegative/insert_into5.q.out index 51bceb2..26ad560 100644 --- a/ql/src/test/results/clientnegative/insert_into5.q.out +++ b/ql/src/test/results/clientnegative/insert_into5.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE insert_into5_neg (key int, value string) TBLPROPERTIES ("immutable"="true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@insert_into5_neg POSTHOOK: query: CREATE TABLE insert_into5_neg (key int, value string) TBLPROPERTIES ("immutable"="true") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/insert_into6.q.out b/ql/src/test/results/clientnegative/insert_into6.q.out index 717c5d1..8d2145d 100644 --- a/ql/src/test/results/clientnegative/insert_into6.q.out +++ b/ql/src/test/results/clientnegative/insert_into6.q.out @@ -6,6 +6,7 @@ PREHOOK: query: CREATE TABLE insert_into6_neg (key int, value string) PARTITIONED BY (ds string) TBLPROPERTIES("immutable"="true") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@insert_into6_neg POSTHOOK: query: CREATE TABLE insert_into6_neg (key int, value string) PARTITIONED BY (ds string) TBLPROPERTIES("immutable"="true") POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientnegative/insertexternal1.q.out b/ql/src/test/results/clientnegative/insertexternal1.q.out index 3df5013..c227185 100644 --- a/ql/src/test/results/clientnegative/insertexternal1.q.out +++ b/ql/src/test/results/clientnegative/insertexternal1.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create external table texternal(key string, val string) partitioned by (insertdate string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@texternal POSTHOOK: query: create external table texternal(key string, val string) partitioned by (insertdate string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 e46c7a6..a40ffab 100644 --- a/ql/src/test/results/clientnegative/insertover_dynapart_ifnotexists.q.out +++ b/ql/src/test/results/clientnegative/insertover_dynapart_ifnotexists.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table srcpart_dp like srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@srcpart_dp POSTHOOK: query: create table srcpart_dp like srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ POSTHOOK: Output: default@srcpart_dp PREHOOK: query: create table destpart_dp like srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@destpart_dp POSTHOOK: query: create table destpart_dp like srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 0897a2c..f2db9d2 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,7 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tbl POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 0384fd9..41e1c80 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,7 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tbl POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 bd5abe7..23e3403 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,7 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tbl POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 5e2df11..3541ef6 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,7 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tbl POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 58ad9eb..177039c 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,7 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tbl POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 693034b..668380f 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,7 @@ PREHOOK: query: create table tbl (a binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tbl POSTHOOK: query: create table tbl (a binary) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 1ace0e9..88bcde6 100644 --- a/ql/src/test/results/clientnegative/invalid_select_column.q.out +++ b/ql/src/test/results/clientnegative/invalid_select_column.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@test_invalid_column 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 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 354ed93..14e18c0 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@test_invalid_column 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 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 226ee37..5f8bd12 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@test_invalid_column 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 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 232f663..fe85e66 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,7 @@ PREHOOK: query: CREATE TABLE alter_test (d STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter_test POSTHOOK: query: CREATE TABLE alter_test (d STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 232f663..fe85e66 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,7 @@ PREHOOK: query: CREATE TABLE alter_test (d STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter_test POSTHOOK: query: CREATE TABLE alter_test (d STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/invalidate_view1.q.out b/ql/src/test/results/clientnegative/invalidate_view1.q.out index c9da48d..59caaaf 100644 --- a/ql/src/test/results/clientnegative/invalidate_view1.q.out +++ b/ql/src/test/results/clientnegative/invalidate_view1.q.out @@ -12,6 +12,7 @@ PREHOOK: query: -- create two levels of view reference, then invalidate intermed CREATE TABLE xxx10 (key int, value int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@xxx10 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 diff --git a/ql/src/test/results/clientnegative/join28.q.out b/ql/src/test/results/clientnegative/join28.q.out index f3211cb..e371fea 100644 --- a/ql/src/test/results/clientnegative/join28.q.out +++ b/ql/src/test/results/clientnegative/join28.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_j1 POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/join29.q.out b/ql/src/test/results/clientnegative/join29.q.out index b8b2739..4fdf554 100644 --- a/ql/src/test/results/clientnegative/join29.q.out +++ b/ql/src/test/results/clientnegative/join29.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_j1 POSTHOOK: query: CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/join32.q.out b/ql/src/test/results/clientnegative/join32.q.out index da3494b..6281e28 100644 --- a/ql/src/test/results/clientnegative/join32.q.out +++ b/ql/src/test/results/clientnegative/join32.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_j1 POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/join35.q.out b/ql/src/test/results/clientnegative/join35.q.out index 333c838..0488a83 100644 --- a/ql/src/test/results/clientnegative/join35.q.out +++ b/ql/src/test/results/clientnegative/join35.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_j1 POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/limit_partition_stats.q.out b/ql/src/test/results/clientnegative/limit_partition_stats.q.out index e9cc549..5a5fe1f 100644 --- a/ql/src/test/results/clientnegative/limit_partition_stats.q.out +++ b/ql/src/test/results/clientnegative/limit_partition_stats.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table part (c int) partitioned by (d string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@part POSTHOOK: query: create table part (c int) partitioned by (d string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 787b1eb..491cfd0 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,6 +1,7 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@hive_test_src POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 c3d5663..4441a88 100644 --- a/ql/src/test/results/clientnegative/load_non_native.q.out +++ b/ql/src/test/results/clientnegative/load_non_native.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@non_native2 POSTHOOK: query: CREATE TABLE non_native2(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' POSTHOOK: type: CREATETABLE 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 cf48b14..945f3ec 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,7 @@ PREHOOK: query: create table hive_test_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@hive_test_src POSTHOOK: query: create table hive_test_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 2e896a8..4ea8be9 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,7 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@hive_test_src POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 9331a1c..bebaf92 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,7 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@hive_test_src POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 b89027f..22d4ee8 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 @@ -3,6 +3,7 @@ CREATE TABLE if not exists stored_as_dirs_multiple (col1 STRING, col2 int, col3 SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)) stored as DIRECTORIES PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@stored_as_dirs_multiple 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 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 628841c..732eb22 100644 --- a/ql/src/test/results/clientnegative/load_wrong_fileformat.q.out +++ b/ql/src/test/results/clientnegative/load_wrong_fileformat.q.out @@ -5,6 +5,7 @@ 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 +PREHOOK: Output: default@load_wrong_fileformat_T1 POSTHOOK: query: -- test for loading into tables with the correct file format -- test for loading into partitions with the correct file format 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 e94200b..b68b8e6 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 @@ -5,6 +5,7 @@ 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 +PREHOOK: Output: default@T1 POSTHOOK: query: -- test for loading into tables with the correct file format -- test for loading into partitions with the correct file format 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 eb42478..179a654 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 @@ -5,6 +5,7 @@ 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 +PREHOOK: Output: default@T1 POSTHOOK: query: -- test for loading into tables with the correct file format -- test for loading into partitions with the correct file format 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 80e80e3..cf11cdc 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,7 @@ PREHOOK: query: CREATE TABLE loadpart1(a STRING, b STRING) PARTITIONED BY (ds STRING,ds1 STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loadpart1 POSTHOOK: query: CREATE TABLE loadpart1(a STRING, b STRING) PARTITIONED BY (ds STRING,ds1 STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/lockneg1.q.out b/ql/src/test/results/clientnegative/lockneg1.q.out index c8f514d..3a96cda 100644 --- a/ql/src/test/results/clientnegative/lockneg1.q.out +++ b/ql/src/test/results/clientnegative/lockneg1.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tstsrc POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/lockneg2.q.out b/ql/src/test/results/clientnegative/lockneg2.q.out index 33a1f0b..31e9087 100644 --- a/ql/src/test/results/clientnegative/lockneg2.q.out +++ b/ql/src/test/results/clientnegative/lockneg2.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tstsrc POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/lockneg3.q.out b/ql/src/test/results/clientnegative/lockneg3.q.out index 1173aba..e4f6357 100644 --- a/ql/src/test/results/clientnegative/lockneg3.q.out +++ b/ql/src/test/results/clientnegative/lockneg3.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tstsrcpart POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/lockneg4.q.out b/ql/src/test/results/clientnegative/lockneg4.q.out index a102504..c31a23c 100644 --- a/ql/src/test/results/clientnegative/lockneg4.q.out +++ b/ql/src/test/results/clientnegative/lockneg4.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tstsrcpart POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 cf19740..134a57b 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 @@ -1,14 +1,19 @@ PREHOOK: query: create database lockneg1 PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:lockneg1 POSTHOOK: query: create database lockneg1 POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:lockneg1 PREHOOK: query: use lockneg1 PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:lockneg1 POSTHOOK: query: use lockneg1 POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:lockneg1 PREHOOK: query: create table tstsrcpart like default.srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:lockneg1 +PREHOOK: Output: lockneg1@tstsrcpart POSTHOOK: query: create table tstsrcpart like default.srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:lockneg1 diff --git a/ql/src/test/results/clientnegative/lockneg_try_db_lock_conflict.q.out b/ql/src/test/results/clientnegative/lockneg_try_db_lock_conflict.q.out index 92d7447..0a5d98a 100644 --- a/ql/src/test/results/clientnegative/lockneg_try_db_lock_conflict.q.out +++ b/ql/src/test/results/clientnegative/lockneg_try_db_lock_conflict.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create database lockneg4 PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:lockneg4 POSTHOOK: query: create database lockneg4 POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:lockneg4 PREHOOK: query: lock database lockneg4 exclusive PREHOOK: type: LOCKDATABASE POSTHOOK: query: lock database lockneg4 exclusive diff --git a/ql/src/test/results/clientnegative/lockneg_try_drop_locked_db.q.out b/ql/src/test/results/clientnegative/lockneg_try_drop_locked_db.q.out index 2fcff1b..5ac4e3c 100644 --- a/ql/src/test/results/clientnegative/lockneg_try_drop_locked_db.q.out +++ b/ql/src/test/results/clientnegative/lockneg_try_drop_locked_db.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create database lockneg9 PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:lockneg9 POSTHOOK: query: create database lockneg9 POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:lockneg9 PREHOOK: query: lock database lockneg9 shared PREHOOK: type: LOCKDATABASE POSTHOOK: query: lock database lockneg9 shared 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 0242338..97ab37a 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 @@ -1,14 +1,19 @@ PREHOOK: query: create database lockneg2 PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:lockneg2 POSTHOOK: query: create database lockneg2 POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:lockneg2 PREHOOK: query: use lockneg2 PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:lockneg2 POSTHOOK: query: use lockneg2 POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:lockneg2 PREHOOK: query: create table tstsrcpart like default.srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:lockneg2 +PREHOOK: Output: lockneg2@tstsrcpart POSTHOOK: query: create table tstsrcpart like default.srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:lockneg2 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 95f6678..5947bb2 100644 --- a/ql/src/test/results/clientnegative/merge_negative_1.q.out +++ b/ql/src/test/results/clientnegative/merge_negative_1.q.out @@ -1,13 +1,16 @@ PREHOOK: query: create table src2 like src PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src2 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 +PREHOOK: Input: default@src2 POSTHOOK: query: CREATE INDEX src_index_merge_test ON TABLE src2(key) as 'COMPACT' WITH DEFERRED REBUILD POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@src2 POSTHOOK: Output: default@default__src2_src_index_merge_test__ FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: can not do merge because source table src2 is indexed. 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 b3422e1..66dd54a 100644 --- a/ql/src/test/results/clientnegative/merge_negative_2.q.out +++ b/ql/src/test/results/clientnegative/merge_negative_2.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table srcpart2 (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@srcpart2 POSTHOOK: query: create table srcpart2 (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 6fd029e..906336d 100644 --- a/ql/src/test/results/clientnegative/merge_negative_3.q.out +++ b/ql/src/test/results/clientnegative/merge_negative_3.q.out @@ -1,6 +1,7 @@ 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 +PREHOOK: Output: default@srcpart2 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 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 59b5548..a6f9ac5 100644 --- a/ql/src/test/results/clientnegative/nested_complex_neg.q.out +++ b/ql/src/test/results/clientnegative/nested_complex_neg.q.out @@ -6,4 +6,5 @@ max_nested_struct array) diff --git a/ql/src/test/results/clientnegative/serde_regex2.q.out b/ql/src/test/results/clientnegative/serde_regex2.q.out index 8ed0bee..198f79b 100644 --- a/ql/src/test/results/clientnegative/serde_regex2.q.out +++ b/ql/src/test/results/clientnegative/serde_regex2.q.out @@ -1,7 +1,9 @@ PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:default POSTHOOK: query: USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: 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, @@ -20,6 +22,7 @@ WITH SERDEPROPERTIES ( STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@serde_regex 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, diff --git a/ql/src/test/results/clientnegative/serde_regex3.q.out b/ql/src/test/results/clientnegative/serde_regex3.q.out index 4eea704..1df4cd6 100644 --- a/ql/src/test/results/clientnegative/serde_regex3.q.out +++ b/ql/src/test/results/clientnegative/serde_regex3.q.out @@ -1,7 +1,9 @@ PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:default POSTHOOK: query: USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: query: -- null input.regex, raise an exception CREATE TABLE serde_regex( host STRING, @@ -17,4 +19,5 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.RegexSerDe' STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@serde_regex 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 0e44919..2278456 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,7 @@ PREHOOK: query: create table testTable(col1 int, col2 int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@testTable POSTHOOK: query: create table testTable(col1 int, col2 int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/show_columns3.q.out b/ql/src/test/results/clientnegative/show_columns3.q.out index 09068b7..98d58dc 100644 --- a/ql/src/test/results/clientnegative/show_columns3.q.out +++ b/ql/src/test/results/clientnegative/show_columns3.q.out @@ -1,20 +1,27 @@ PREHOOK: query: CREATE DATABASE test_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:test_db POSTHOOK: query: CREATE DATABASE test_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:test_db PREHOOK: query: USE test_db PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:test_db POSTHOOK: query: USE test_db POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:test_db PREHOOK: query: CREATE TABLE foo(a INT) PREHOOK: type: CREATETABLE PREHOOK: Output: database:test_db +PREHOOK: Output: test_db@foo 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 +PREHOOK: Input: database:default POSTHOOK: query: use default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default FAILED: SemanticException [Error 10001]: Table not found test_db.foo 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 162ef9b..7f03efd 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,13 +1,16 @@ PREHOOK: query: CREATE TABLE tmp_showcrt (key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tmp_showcrt 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 +PREHOOK: Input: default@tmp_showcrt POSTHOOK: query: CREATE INDEX tmp_index on table tmp_showcrt(key) as 'compact' WITH DEFERRED REBUILD POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@tmp_showcrt POSTHOOK: Output: default@default__tmp_showcrt_tmp_index__ FAILED: SemanticException [Error 10144]: SHOW CREATE TABLE does not support tables of type INDEX_TABLE. default__tmp_showcrt_tmp_index__ has table type INDEX_TABLE diff --git a/ql/src/test/results/clientnegative/smb_bucketmapjoin.q.out b/ql/src/test/results/clientnegative/smb_bucketmapjoin.q.out index fa8d7bb..23938d2 100644 --- a/ql/src/test/results/clientnegative/smb_bucketmapjoin.q.out +++ b/ql/src/test/results/clientnegative/smb_bucketmapjoin.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@smb_bucket4_1 POSTHOOK: query: CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@smb_bucket4_2 POSTHOOK: query: CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 fa931e3..de32df3 100644 --- a/ql/src/test/results/clientnegative/smb_mapjoin_14.q.out +++ b/ql/src/test/results/clientnegative/smb_mapjoin_14.q.out @@ -1,6 +1,7 @@ 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 +PREHOOK: Output: default@tbl1 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 @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@tbl2 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 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 0ef2053..4fc6f27 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 @@ -2,6 +2,7 @@ PREHOOK: query: create table table_asc(key int, value string) CLUSTERED BY (key) INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@table_asc 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 @@ -11,6 +12,7 @@ PREHOOK: query: create table table_desc(key int, value string) CLUSTERED BY (key INTO 1 BUCKETS STORED AS RCFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@table_desc 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 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 d433b6c..47ba34b 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 @@ -7,6 +7,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 +PREHOOK: Output: default@tmptable 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 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 d9c5c06..ff3e073 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 @@ -6,6 +6,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 +PREHOOK: Output: default@tmptable 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 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 48565f5..99d9c0f 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@non_native1 POSTHOOK: query: CREATE TABLE non_native1(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' POSTHOOK: type: CREATETABLE 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 0d5347e..321ebe5 100644 --- a/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out +++ b/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out @@ -6,6 +6,7 @@ partitioned by (ds string, hr string) stored as rcfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@analyze_srcpart_partial_scan POSTHOOK: query: -- test analyze table ... compute statistics partialscan -- 1. prepare data 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 7fb1a76..ce3073b 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,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE external_table (key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@external_table POSTHOOK: query: CREATE EXTERNAL TABLE external_table (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 1abeff9..9d46969 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@non_native1 POSTHOOK: query: CREATE TABLE non_native1(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' POSTHOOK: type: CREATETABLE 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 06d5f6c..7f7763b 100644 --- a/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out +++ b/ql/src/test/results/clientnegative/stats_partscan_norcfile.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- test analyze table ... compute statistics partialscan create table analyze_srcpart_partial_scan like srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@analyze_srcpart_partial_scan POSTHOOK: query: -- test analyze table ... compute statistics partialscan create table analyze_srcpart_partial_scan like srcpart 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 ae89860..f0e4034 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 @@ -7,6 +7,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 +PREHOOK: Output: default@tmptable 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 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 5cec747..c10108b 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 @@ -6,6 +6,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 +PREHOOK: Output: default@tmptable 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 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 4950ec9..4a7dab6 100644 --- a/ql/src/test/results/clientnegative/subquery_nested_subquery.q.out +++ b/ql/src/test/results/clientnegative/subquery_nested_subquery.q.out @@ -11,6 +11,7 @@ PREHOOK: query: CREATE TABLE part( ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@part POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, 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 d45f8f1..c54f54e 100644 --- a/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out +++ b/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out @@ -16,6 +16,7 @@ CREATE TABLE part( ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@part POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, diff --git a/ql/src/test/results/clientnegative/temp_table_authorize_create_tbl.q.out b/ql/src/test/results/clientnegative/temp_table_authorize_create_tbl.q.out index 2322e42..5db06f1 100644 --- a/ql/src/test/results/clientnegative/temp_table_authorize_create_tbl.q.out +++ b/ql/src/test/results/clientnegative/temp_table_authorize_create_tbl.q.out @@ -1,9 +1,13 @@ PREHOOK: query: create database db23221 PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:db23221 POSTHOOK: query: create database db23221 POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:db23221 PREHOOK: query: use db23221 PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:db23221 POSTHOOK: query: use db23221 POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:db23221 FAILED: HiveAccessControlException Permission denied: Principal [name=user44, type=USER] does not have following privileges for operation CREATETABLE [[OBJECT OWNERSHIP] on Object [type=DATABASE, name=db23221]] diff --git a/ql/src/test/results/clientnegative/temp_table_column_stats.q.out b/ql/src/test/results/clientnegative/temp_table_column_stats.q.out index 4b0c0bc..486597a 100644 --- a/ql/src/test/results/clientnegative/temp_table_column_stats.q.out +++ b/ql/src/test/results/clientnegative/temp_table_column_stats.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create temporary table tmp1 (c1 string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tmp1 POSTHOOK: query: create temporary table tmp1 (c1 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/temp_table_create_like_partitions.q.out b/ql/src/test/results/clientnegative/temp_table_create_like_partitions.q.out index d7b0e6d..d0a8cb4 100644 --- a/ql/src/test/results/clientnegative/temp_table_create_like_partitions.q.out +++ b/ql/src/test/results/clientnegative/temp_table_create_like_partitions.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table tab1 (c1 string) partitioned by (p1 string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tab1 POSTHOOK: query: create table tab1 (c1 string) partitioned by (p1 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ POSTHOOK: Output: default@tab1 PREHOOK: query: create table tmp1 like tab1 PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tmp1 POSTHOOK: query: create table tmp1 like tab1 POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/temp_table_index.q.out b/ql/src/test/results/clientnegative/temp_table_index.q.out index 8ec5c0a..5882279 100644 --- a/ql/src/test/results/clientnegative/temp_table_index.q.out +++ b/ql/src/test/results/clientnegative/temp_table_index.q.out @@ -1,10 +1,12 @@ PREHOOK: query: create temporary table tmp1 (c1 string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tmp1 POSTHOOK: query: create temporary table tmp1 (c1 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@tmp1 PREHOOK: query: create index tmp1_idx on table tmp1 (c1) as 'COMPACT' with deferred rebuild PREHOOK: type: CREATEINDEX +PREHOOK: Input: default@tmp1 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. org.apache.hadoop.hive.ql.metadata.HiveException: tableName=tmp1 is a TEMPORARY TABLE. Index on TEMPORARY TABLE is not supported. diff --git a/ql/src/test/results/clientnegative/temp_table_rename.q.out b/ql/src/test/results/clientnegative/temp_table_rename.q.out index c8d4861..7622a25 100644 --- a/ql/src/test/results/clientnegative/temp_table_rename.q.out +++ b/ql/src/test/results/clientnegative/temp_table_rename.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create temporary table tmp1 (c1 string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tmp1 POSTHOOK: query: create temporary table tmp1 (c1 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ POSTHOOK: Output: default@tmp1 PREHOOK: query: create temporary table tmp2 (d1 string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tmp2 POSTHOOK: query: create temporary table tmp2 (d1 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 edad90c..80981e8 100644 --- a/ql/src/test/results/clientnegative/truncate_bucketed_column.q.out +++ b/ql/src/test/results/clientnegative/truncate_bucketed_column.q.out @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@test_tab POSTHOOK: query: -- Tests truncating a bucketed column CREATE TABLE test_tab (key STRING, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS RCFILE 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 2ca7f9b..2844c7b 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 @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@test_tab POSTHOOK: query: -- Tests truncating a column from an indexed table CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE @@ -21,7 +22,9 @@ POSTHOOK: Lineage: test_tab.key SIMPLE [(src)src.FieldSchema(name:key, type:stri POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] PREHOOK: query: CREATE INDEX test_tab_index ON TABLE test_tab (key) as 'COMPACT' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX +PREHOOK: Input: default@test_tab POSTHOOK: query: CREATE INDEX test_tab_index ON TABLE test_tab (key) as 'COMPACT' WITH DEFERRED REBUILD POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@test_tab POSTHOOK: Output: default@default__test_tab_test_tab_index__ FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: Can not truncate columns from table with indexes 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 bf08bcc..ede7647 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 @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@test_tab POSTHOOK: query: -- Tests truncating a column on which a table is list bucketed CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE 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 9e0aa2d..2fb494b 100644 --- a/ql/src/test/results/clientnegative/truncate_column_seqfile.q.out +++ b/ql/src/test/results/clientnegative/truncate_column_seqfile.q.out @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@test_tab 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 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 028b25c..8112fa6 100644 --- a/ql/src/test/results/clientnegative/truncate_nonexistant_column.q.out +++ b/ql/src/test/results/clientnegative/truncate_nonexistant_column.q.out @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@test_tab 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 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 b47029f..9197c71 100644 --- a/ql/src/test/results/clientnegative/truncate_partition_column.q.out +++ b/ql/src/test/results/clientnegative/truncate_partition_column.q.out @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@test_tab POSTHOOK: query: -- Tests truncating a partition column CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE 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 1a81847..baaf610 100644 --- a/ql/src/test/results/clientnegative/truncate_partition_column2.q.out +++ b/ql/src/test/results/clientnegative/truncate_partition_column2.q.out @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@test_tab POSTHOOK: query: -- Tests truncating a partition column CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE 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 fafa821..3145560 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,7 @@ PREHOOK: query: create external table external1 (a int, b int) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@external1 POSTHOOK: query: create external table external1 (a int, b int) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 1a85ffb..db4a765 100644 --- a/ql/src/test/results/clientnegative/truncate_table_failure4.q.out +++ b/ql/src/test/results/clientnegative/truncate_table_failure4.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@non_native POSTHOOK: query: CREATE TABLE non_native(key int, value string) STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler' POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientnegative/union2.q.out b/ql/src/test/results/clientnegative/union2.q.out index cc14124..07b6fa9 100644 --- a/ql/src/test/results/clientnegative/union2.q.out +++ b/ql/src/test/results/clientnegative/union2.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table if not exists union2_t1(r string, c string, v array) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@union2_t1 POSTHOOK: query: create table if not exists union2_t1(r string, c string, v array) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@union2_t2 POSTHOOK: query: create table if not exists union2_t2(s string, c string, v string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/union22.q.out b/ql/src/test/results/clientnegative/union22.q.out index 7364033..1db78af 100644 --- a/ql/src/test/results/clientnegative/union22.q.out +++ b/ql/src/test/results/clientnegative/union22.q.out @@ -1,6 +1,7 @@ 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 +PREHOOK: Output: default@dst_union22 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 @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@dst_union22_delta 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 diff --git a/ql/src/test/results/clientnegative/union3.q.out b/ql/src/test/results/clientnegative/union3.q.out index 1d73063..de1c62b 100644 --- a/ql/src/test/results/clientnegative/union3.q.out +++ b/ql/src/test/results/clientnegative/union3.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- Ensure that UNION ALL columns are in the correct order on bot CREATE TABLE IF NOT EXISTS union3 (bar int, baz int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@union3 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) 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 45a5e12..8f94c9d 100644 --- a/ql/src/test/results/clientnegative/unset_table_property.q.out +++ b/ql/src/test/results/clientnegative/unset_table_property.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE testTable(col1 INT, col2 INT) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@testTable POSTHOOK: query: CREATE TABLE testTable(col1 INT, col2 INT) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 a7e02f9..05ae8bc 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 @@ -15,6 +15,7 @@ PREHOOK: query: CREATE TABLE part( ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@part POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, 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 c2bf9cf..6fb4b00 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 @@ -16,6 +16,7 @@ CREATE TABLE part( ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@part POSTHOOK: query: -- data setup CREATE TABLE part( p_partkey INT, 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 746e90b..0d5bc98 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 @@ -15,6 +15,7 @@ PREHOOK: query: CREATE TABLE part( ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@part POSTHOOK: query: CREATE TABLE part( p_partkey INT, p_name STRING, 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 67619c2..be48c4e 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,7 @@ PREHOOK: query: CREATE TABLE dest1(a float) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(a float) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 730fcfa..4c22d6a 100644 --- a/ql/src/test/results/clientpositive/add_part_exist.q.out +++ b/ql/src/test/results/clientpositive/add_part_exist.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@add_part_test POSTHOOK: query: CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -93,19 +94,24 @@ srcpart PREHOOK: query: -- Test ALTER TABLE ADD PARTITION in non-default Database CREATE DATABASE add_part_test_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:add_part_test_db POSTHOOK: query: -- Test ALTER TABLE ADD PARTITION in non-default Database CREATE DATABASE add_part_test_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:add_part_test_db PREHOOK: query: USE add_part_test_db PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:add_part_test_db POSTHOOK: query: USE add_part_test_db POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:add_part_test_db PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES 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: add_part_test_db@add_part_test 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 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 ac61206..975baa5 100644 --- a/ql/src/test/results/clientpositive/add_part_multiple.q.out +++ b/ql/src/test/results/clientpositive/add_part_multiple.q.out @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@add_part_test POSTHOOK: query: -- HIVE-5122 locations for 2nd, 3rd... partition are ignored CREATE TABLE add_part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) 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 3518875..4c4be4a 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 @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@part_nowhitelist_test POSTHOOK: query: -- Test with no partition name whitelist pattern CREATE TABLE part_nowhitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) 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 6fda5c9..d996d6d 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 @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@part_whitelist_test POSTHOOK: query: -- This pattern matches only letters. CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) diff --git a/ql/src/test/results/clientpositive/alter1.q.out b/ql/src/test/results/clientpositive/alter1.q.out index 94fa640..1cfaf75 100644 --- a/ql/src/test/results/clientpositive/alter1.q.out +++ b/ql/src/test/results/clientpositive/alter1.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table alter1(a int, b int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter1 POSTHOOK: query: create table alter1(a int, b int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -203,20 +204,25 @@ PREHOOK: query: -- With non-default Database CREATE DATABASE alter1_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:alter1_db POSTHOOK: query: -- With non-default Database CREATE DATABASE alter1_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:alter1_db PREHOOK: query: USE alter1_db PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:alter1_db POSTHOOK: query: USE alter1_db POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:alter1_db PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES POSTHOOK: type: SHOWTABLES PREHOOK: query: CREATE TABLE alter1(a INT, b INT) PREHOOK: type: CREATETABLE +PREHOOK: Output: alter1_db@alter1 PREHOOK: Output: database:alter1_db POSTHOOK: query: CREATE TABLE alter1(a INT, b INT) POSTHOOK: type: CREATETABLE @@ -403,8 +409,10 @@ POSTHOOK: Input: alter1_db@alter1 POSTHOOK: Output: alter1_db@alter1 PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:default POSTHOOK: query: USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: query: DROP DATABASE alter1_db PREHOOK: type: DROPDATABASE PREHOOK: Input: database:alter1_db diff --git a/ql/src/test/results/clientpositive/alter2.q.out b/ql/src/test/results/clientpositive/alter2.q.out index eb3f981..3356ab9 100644 --- a/ql/src/test/results/clientpositive/alter2.q.out +++ b/ql/src/test/results/clientpositive/alter2.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table alter2(a int, b int) partitioned by (insertdate string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter2 POSTHOOK: query: create table alter2(a int, b int) partitioned by (insertdate string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -103,6 +104,7 @@ 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 +PREHOOK: Output: default@alter2 POSTHOOK: query: create external table alter2(a int, b int) partitioned by (insertdate string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -221,20 +223,25 @@ PREHOOK: query: -- Using non-default Database CREATE DATABASE alter2_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:alter2_db POSTHOOK: query: -- Using non-default Database CREATE DATABASE alter2_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:alter2_db PREHOOK: query: USE alter2_db PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:alter2_db POSTHOOK: query: USE alter2_db POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:alter2_db PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES 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: alter2_db@alter2 PREHOOK: Output: database:alter2_db POSTHOOK: query: CREATE TABLE alter2(a int, b int) PARTITIONED BY (insertdate string) POSTHOOK: type: CREATETABLE @@ -337,6 +344,7 @@ 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: alter2_db@alter2 PREHOOK: Output: database:alter2_db POSTHOOK: query: CREATE EXTERNAL TABLE alter2(a int, b int) PARTITIONED BY (insertdate string) POSTHOOK: type: CREATETABLE @@ -439,8 +447,10 @@ POSTHOOK: Input: alter2_db@alter2 POSTHOOK: Output: alter2_db@alter2 PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:default POSTHOOK: query: USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: query: DROP DATABASE alter2_db PREHOOK: type: DROPDATABASE PREHOOK: Input: database:alter2_db diff --git a/ql/src/test/results/clientpositive/alter3.q.out b/ql/src/test/results/clientpositive/alter3.q.out index ba03a53..70353d3 100644 --- a/ql/src/test/results/clientpositive/alter3.q.out +++ b/ql/src/test/results/clientpositive/alter3.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table alter3_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter3_src POSTHOOK: query: create table alter3_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -16,6 +17,7 @@ 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 +PREHOOK: Output: default@alter3 POSTHOOK: query: create table alter3 ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -23,6 +25,7 @@ POSTHOOK: Output: default@alter3 PREHOOK: query: create table alter3_like like alter3 PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter3_like POSTHOOK: query: create table alter3_like like alter3 POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -193,20 +196,25 @@ PREHOOK: query: -- With non-default Database CREATE DATABASE alter3_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:alter3_db POSTHOOK: query: -- With non-default Database CREATE DATABASE alter3_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:alter3_db PREHOOK: query: USE alter3_db PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:alter3_db POSTHOOK: query: USE alter3_db POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:alter3_db PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES POSTHOOK: type: SHOWTABLES PREHOOK: query: CREATE TABLE alter3_src (col1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: alter3_db@alter3_src PREHOOK: Output: database:alter3_db POSTHOOK: query: CREATE TABLE alter3_src (col1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE @@ -222,6 +230,7 @@ POSTHOOK: type: LOAD POSTHOOK: Output: alter3_db@alter3_src PREHOOK: query: CREATE TABLE alter3 (col1 STRING) PARTITIONED BY (pcol1 STRING, pcol2 STRING) STORED AS SEQUENCEFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: alter3_db@alter3 PREHOOK: Output: database:alter3_db POSTHOOK: query: CREATE TABLE alter3 (col1 STRING) PARTITIONED BY (pcol1 STRING, pcol2 STRING) STORED AS SEQUENCEFILE POSTHOOK: type: CREATETABLE @@ -229,6 +238,7 @@ POSTHOOK: Output: alter3_db@alter3 POSTHOOK: Output: database:alter3_db PREHOOK: query: CREATE TABLE alter3_like LIKE alter3 PREHOOK: type: CREATETABLE +PREHOOK: Output: alter3_db@alter3_like PREHOOK: Output: database:alter3_db POSTHOOK: query: CREATE TABLE alter3_like LIKE alter3 POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/alter4.q.out b/ql/src/test/results/clientpositive/alter4.q.out index 50f1a48..42fa2d1 100644 --- a/ql/src/test/results/clientpositive/alter4.q.out +++ b/ql/src/test/results/clientpositive/alter4.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE set_bucketing_test (key INT, value STRING) CLUSTERED BY (key) INTO 10 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@set_bucketing_test POSTHOOK: query: CREATE TABLE set_bucketing_test (key INT, value STRING) CLUSTERED BY (key) INTO 10 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -60,20 +61,25 @@ PREHOOK: query: -- with non-default Database CREATE DATABASE alter4_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:alter4_db POSTHOOK: query: -- with non-default Database CREATE DATABASE alter4_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:alter4_db PREHOOK: query: USE alter4_db PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:alter4_db POSTHOOK: query: USE alter4_db POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:alter4_db PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES 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: alter4_db@set_bucketing_test 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 @@ -117,8 +123,10 @@ POSTHOOK: Input: alter4_db@set_bucketing_test POSTHOOK: Output: alter4_db@set_bucketing_test PREHOOK: query: USE default PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:default POSTHOOK: query: USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: query: DROP DATABASE alter4_db PREHOOK: type: DROPDATABASE PREHOOK: Input: database:alter4_db diff --git a/ql/src/test/results/clientpositive/alter5.q.out b/ql/src/test/results/clientpositive/alter5.q.out index 40a7578..a83b68d 100644 --- a/ql/src/test/results/clientpositive/alter5.q.out +++ b/ql/src/test/results/clientpositive/alter5.q.out @@ -5,6 +5,7 @@ PREHOOK: query: -- create table alter5_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter5_src POSTHOOK: query: -- -- Added to validate the fix for HIVE-2117 - explicit partition location -- @@ -24,6 +25,7 @@ POSTHOOK: Output: default@alter5_src PREHOOK: query: create table alter5 ( col1 string ) partitioned by (dt string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter5 POSTHOOK: query: create table alter5 ( col1 string ) partitioned by (dt string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -135,20 +137,25 @@ PREHOOK: query: -- With non-default Database CREATE DATABASE alter5_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:alter5_db POSTHOOK: query: -- With non-default Database CREATE DATABASE alter5_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:alter5_db PREHOOK: query: USE alter5_db PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:alter5_db POSTHOOK: query: USE alter5_db POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:alter5_db PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES POSTHOOK: type: SHOWTABLES PREHOOK: query: create table alter5_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: alter5_db@alter5_src PREHOOK: Output: database:alter5_db POSTHOOK: query: create table alter5_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE @@ -164,6 +171,7 @@ POSTHOOK: type: LOAD POSTHOOK: Output: alter5_db@alter5_src PREHOOK: query: create table alter5 ( col1 string ) partitioned by (dt string) PREHOOK: type: CREATETABLE +PREHOOK: Output: alter5_db@alter5 PREHOOK: Output: database:alter5_db POSTHOOK: query: create table alter5 ( col1 string ) partitioned by (dt string) POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/alter_char1.q.out b/ql/src/test/results/clientpositive/alter_char1.q.out index f98009b..017da60 100644 --- a/ql/src/test/results/clientpositive/alter_char1.q.out +++ b/ql/src/test/results/clientpositive/alter_char1.q.out @@ -9,6 +9,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table alter_char_1 (key string, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter_char_1 POSTHOOK: query: create table alter_char_1 (key string, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/alter_char2.q.out b/ql/src/test/results/clientpositive/alter_char2.q.out index dcdd990..7ea86ca 100644 --- a/ql/src/test/results/clientpositive/alter_char2.q.out +++ b/ql/src/test/results/clientpositive/alter_char2.q.out @@ -9,6 +9,7 @@ PREHOOK: query: create table alter_char2 ( ) partitioned by (hr int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter_char2 POSTHOOK: query: create table alter_char2 ( c1 char(255) ) partitioned by (hr int) 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 20af0c7..ffcbcf9 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,6 +1,7 @@ PREHOOK: query: create table src_rc_concatenate_test(key int, value string) stored as rcfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_rc_concatenate_test POSTHOOK: query: create table src_rc_concatenate_test(key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -66,8 +67,10 @@ POSTHOOK: Input: default@src_rc_concatenate_test 214 -7678496319 PREHOOK: query: create index src_rc_concatenate_test_index on table src_rc_concatenate_test(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2") PREHOOK: type: CREATEINDEX +PREHOOK: Input: default@src_rc_concatenate_test POSTHOOK: query: create index src_rc_concatenate_test_index on table src_rc_concatenate_test(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2") POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@src_rc_concatenate_test POSTHOOK: Output: default@default__src_rc_concatenate_test_src_rc_concatenate_test_index__ PREHOOK: query: show indexes on src_rc_concatenate_test PREHOOK: type: SHOWINDEXES @@ -119,11 +122,14 @@ POSTHOOK: Input: default@src_rc_concatenate_test 214 -7678496319 PREHOOK: query: drop index src_rc_concatenate_test_index on src_rc_concatenate_test PREHOOK: type: DROPINDEX +PREHOOK: Input: default@src_rc_concatenate_test POSTHOOK: query: drop index src_rc_concatenate_test_index on src_rc_concatenate_test POSTHOOK: type: DROPINDEX +POSTHOOK: Input: default@src_rc_concatenate_test 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 +PREHOOK: Output: default@src_rc_concatenate_test_part 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 @@ -200,8 +206,10 @@ POSTHOOK: Input: default@src_rc_concatenate_test_part@ds=2011 214 -7678496319 PREHOOK: query: create index src_rc_concatenate_test_part_index on table src_rc_concatenate_test_part(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2") PREHOOK: type: CREATEINDEX +PREHOOK: Input: default@src_rc_concatenate_test_part POSTHOOK: query: create index src_rc_concatenate_test_part_index on table src_rc_concatenate_test_part(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2") POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@src_rc_concatenate_test_part POSTHOOK: Output: default@default__src_rc_concatenate_test_part_src_rc_concatenate_test_part_index__ PREHOOK: query: show indexes on src_rc_concatenate_test_part PREHOOK: type: SHOWINDEXES @@ -257,5 +265,7 @@ POSTHOOK: Input: default@src_rc_concatenate_test_part@ds=2011 214 -7678496319 PREHOOK: query: drop index src_rc_concatenate_test_part_index on src_rc_concatenate_test_part PREHOOK: type: DROPINDEX +PREHOOK: Input: default@src_rc_concatenate_test_part POSTHOOK: query: drop index src_rc_concatenate_test_part_index on src_rc_concatenate_test_part POSTHOOK: type: DROPINDEX +POSTHOOK: Input: default@src_rc_concatenate_test_part diff --git a/ql/src/test/results/clientpositive/alter_db_owner.q.out b/ql/src/test/results/clientpositive/alter_db_owner.q.out index 83ffab4..19b88df 100644 --- a/ql/src/test/results/clientpositive/alter_db_owner.q.out +++ b/ql/src/test/results/clientpositive/alter_db_owner.q.out @@ -1,7 +1,9 @@ PREHOOK: query: create database db_alter_onr PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:db_alter_onr POSTHOOK: query: create database db_alter_onr POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:db_alter_onr PREHOOK: query: describe database db_alter_onr PREHOOK: type: DESCDATABASE POSTHOOK: query: describe database db_alter_onr diff --git a/ql/src/test/results/clientpositive/alter_file_format.q.out b/ql/src/test/results/clientpositive/alter_file_format.q.out index b172c20..4d6389a 100644 --- a/ql/src/test/results/clientpositive/alter_file_format.q.out +++ b/ql/src/test/results/clientpositive/alter_file_format.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table alter_file_format_test (key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter_file_format_test POSTHOOK: query: create table alter_file_format_test (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -314,6 +315,7 @@ 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 +PREHOOK: Output: default@alter_partition_format_test POSTHOOK: query: --partitioned table create table alter_partition_format_test (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/alter_index.q.out b/ql/src/test/results/clientpositive/alter_index.q.out index 7a8c7ed..2093e2f 100644 --- a/ql/src/test/results/clientpositive/alter_index.q.out +++ b/ql/src/test/results/clientpositive/alter_index.q.out @@ -1,11 +1,15 @@ PREHOOK: query: drop index src_index_8 on src PREHOOK: type: DROPINDEX +PREHOOK: Input: default@src POSTHOOK: query: drop index src_index_8 on src POSTHOOK: type: DROPINDEX +POSTHOOK: Input: default@src PREHOOK: query: create index src_index_8 on table src(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2") PREHOOK: type: CREATEINDEX +PREHOOK: Input: default@src POSTHOOK: query: create index src_index_8 on table src(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2") POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@src POSTHOOK: Output: default@default__src_src_index_8__ PREHOOK: query: desc extended default__src_src_index_8__ PREHOOK: type: DESCTABLE @@ -35,8 +39,10 @@ _offsets array #### A masked pattern was here #### PREHOOK: query: drop index src_index_8 on src PREHOOK: type: DROPINDEX +PREHOOK: Input: default@src POSTHOOK: query: drop index src_index_8 on src POSTHOOK: type: DROPINDEX +POSTHOOK: Input: default@src PREHOOK: query: show tables PREHOOK: type: SHOWTABLES POSTHOOK: query: show tables diff --git a/ql/src/test/results/clientpositive/alter_merge.q.out b/ql/src/test/results/clientpositive/alter_merge.q.out index a35313e..17d86b8 100644 --- a/ql/src/test/results/clientpositive/alter_merge.q.out +++ b/ql/src/test/results/clientpositive/alter_merge.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table src_rc_merge_test(key int, value string) stored as rcfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_rc_merge_test POSTHOOK: query: create table src_rc_merge_test(key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -110,6 +111,7 @@ POSTHOOK: Input: default@src_rc_merge_test 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 +PREHOOK: Output: default@src_rc_merge_test_part 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 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 2b41a17..e118c39 100644 --- a/ql/src/test/results/clientpositive/alter_merge_2.q.out +++ b/ql/src/test/results/clientpositive/alter_merge_2.q.out @@ -1,6 +1,7 @@ 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 +PREHOOK: Output: default@src_rc_merge_test_part 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 diff --git a/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out b/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out index 09ede07..1ccae8e 100644 --- a/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out +++ b/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table src_orc_merge_test_part(key int, value string) partitioned by (ds string, ts string) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_orc_merge_test_part POSTHOOK: query: create table src_orc_merge_test_part(key int, value string) partitioned by (ds string, ts string) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/alter_merge_3.q.out b/ql/src/test/results/clientpositive/alter_merge_3.q.out index 572ff65..f637da2 100644 --- a/ql/src/test/results/clientpositive/alter_merge_3.q.out +++ b/ql/src/test/results/clientpositive/alter_merge_3.q.out @@ -1,6 +1,7 @@ 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 +PREHOOK: Output: default@src_rc_merge_test_part 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 diff --git a/ql/src/test/results/clientpositive/alter_merge_orc.q.out b/ql/src/test/results/clientpositive/alter_merge_orc.q.out index 2610541..f26e38c 100644 --- a/ql/src/test/results/clientpositive/alter_merge_orc.q.out +++ b/ql/src/test/results/clientpositive/alter_merge_orc.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table src_orc_merge_test(key int, value string) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_orc_merge_test POSTHOOK: query: create table src_orc_merge_test(key int, value string) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -116,6 +117,7 @@ POSTHOOK: Input: default@src_orc_merge_test PREHOOK: query: create table src_orc_merge_test_part(key int, value string) partitioned by (ds string) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_orc_merge_test_part POSTHOOK: query: create table src_orc_merge_test_part(key int, value string) partitioned by (ds string) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 49c5556..fdd2ddc 100644 --- a/ql/src/test/results/clientpositive/alter_merge_stats.q.out +++ b/ql/src/test/results/clientpositive/alter_merge_stats.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table src_rc_merge_test_stat(key int, value string) stored as rcfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_rc_merge_test_stat POSTHOOK: query: create table src_rc_merge_test_stat(key int, value string) stored as rcfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -112,6 +113,7 @@ value string 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 +PREHOOK: Output: default@src_rc_merge_test_part_stat 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 diff --git a/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out index 09a1672..64e51d5 100644 --- a/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out +++ b/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table src_orc_merge_test_stat(key int, value string) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_orc_merge_test_stat POSTHOOK: query: create table src_orc_merge_test_stat(key int, value string) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -157,6 +158,7 @@ Storage Desc Params: PREHOOK: query: create table src_orc_merge_test_part_stat(key int, value string) partitioned by (ds string) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_orc_merge_test_part_stat POSTHOOK: query: create table src_orc_merge_test_part_stat(key int, value string) partitioned by (ds string) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out index 787677c..bdff1d7 100644 --- a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out +++ b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out @@ -5,6 +5,7 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20,0.20S) CREATE TABLE tst1(key STRING, value STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tst1 POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20,0.20S) -- Tests that when overwriting a partition in a table after altering the bucketing/sorting metadata -- the partition metadata is updated as well. diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out index 7e887c3..5047b23 100644 --- a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out +++ b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out @@ -2,6 +2,7 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20,0.20S) create table tst1(key string, value string) partitioned by (ds string) clustered by (key) into 10 buckets PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tst1 POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20,0.20S) create table tst1(key string, value string) partitioned by (ds string) clustered by (key) into 10 buckets POSTHOOK: type: CREATETABLE 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 05e7d9f..eb08b6f 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,6 +1,7 @@ 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 +PREHOOK: Output: default@alter_table_partition_clusterby_sortby 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 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 37bda45..3152bda 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,6 +1,7 @@ PREHOOK: query: create table alter_partition_format_test (key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter_partition_format_test POSTHOOK: query: create table alter_partition_format_test (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -63,6 +64,7 @@ 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 +PREHOOK: Output: default@alter_partition_format_test POSTHOOK: query: --partitioned table create table alter_partition_format_test (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE 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 995c1fa..80990d9 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@alter_part_protect_mode 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 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 7224132..040ec45 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 @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@part_whitelist_test POSTHOOK: query: -- This pattern matches only letters. CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING) 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 8ce9126..82eeb82 100644 --- a/ql/src/test/results/clientpositive/alter_rename_partition.q.out +++ b/ql/src/test/results/clientpositive/alter_rename_partition.q.out @@ -24,6 +24,7 @@ srcpart PREHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter_rename_partition_src POSTHOOK: query: create table alter_rename_partition_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -39,6 +40,7 @@ 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 +PREHOOK: Output: default@alter_rename_partition 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 @@ -144,20 +146,25 @@ PREHOOK: query: -- With non-default Database CREATE DATABASE alter_rename_partition_db PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:alter_rename_partition_db POSTHOOK: query: -- With non-default Database CREATE DATABASE alter_rename_partition_db POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:alter_rename_partition_db PREHOOK: query: USE alter_rename_partition_db PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:alter_rename_partition_db POSTHOOK: query: USE alter_rename_partition_db POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:alter_rename_partition_db PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES POSTHOOK: type: SHOWTABLES PREHOOK: query: CREATE TABLE alter_rename_partition_src (col1 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE +PREHOOK: Output: alter_rename_partition_db@alter_rename_partition_src PREHOOK: Output: database:alter_rename_partition_db POSTHOOK: query: CREATE TABLE alter_rename_partition_src (col1 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE @@ -173,6 +180,7 @@ POSTHOOK: type: LOAD POSTHOOK: Output: alter_rename_partition_db@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: alter_rename_partition_db@alter_rename_partition 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 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 4d49f1e..5e7c3e2 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 @@ -12,6 +12,7 @@ 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 +PREHOOK: Output: default@authorization_part POSTHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 5cf963e..e6bfc5a 100644 --- a/ql/src/test/results/clientpositive/alter_skewed_table.q.out +++ b/ql/src/test/results/clientpositive/alter_skewed_table.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table original (key STRING, value STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@original POSTHOOK: query: create table original (key STRING, value STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -94,6 +95,7 @@ POSTHOOK: Output: default@original PREHOOK: query: create table original2 (key STRING, value STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@original2 POSTHOOK: query: create table original2 (key STRING, value STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -187,6 +189,7 @@ 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 +PREHOOK: Output: default@original3 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 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 0e496e3..b03146b 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,6 +1,7 @@ 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 +PREHOOK: Output: default@alter_table_not_sorted 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 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 655e084..1c1707c 100644 --- a/ql/src/test/results/clientpositive/alter_table_serde.q.out +++ b/ql/src/test/results/clientpositive/alter_table_serde.q.out @@ -2,6 +2,7 @@ PREHOOK: query: -- test table create table test_table (id int, query string, name string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@test_table POSTHOOK: query: -- test table create table test_table (id int, query string, name string) POSTHOOK: type: CREATETABLE @@ -68,6 +69,7 @@ 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 +PREHOOK: Output: default@test_table POSTHOOK: query: --- test partitioned table create table test_table (id int, query string, name string) partitioned by (dt string) POSTHOOK: type: CREATETABLE 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 81231bc..dc1dae3 100644 --- a/ql/src/test/results/clientpositive/alter_table_serde2.q.out +++ b/ql/src/test/results/clientpositive/alter_table_serde2.q.out @@ -4,6 +4,7 @@ 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 +PREHOOK: Output: default@tst1 POSTHOOK: query: -- Tests that when overwriting a partition in a table after altering the serde properties -- the partition metadata is updated as well. diff --git a/ql/src/test/results/clientpositive/alter_varchar1.q.out b/ql/src/test/results/clientpositive/alter_varchar1.q.out index 3ea433f..e74a7ed 100644 --- a/ql/src/test/results/clientpositive/alter_varchar1.q.out +++ b/ql/src/test/results/clientpositive/alter_varchar1.q.out @@ -9,6 +9,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table alter_varchar_1 (key string, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter_varchar_1 POSTHOOK: query: create table alter_varchar_1 (key string, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/alter_varchar2.q.out b/ql/src/test/results/clientpositive/alter_varchar2.q.out index e1a3890..c589bf2 100644 --- a/ql/src/test/results/clientpositive/alter_varchar2.q.out +++ b/ql/src/test/results/clientpositive/alter_varchar2.q.out @@ -9,6 +9,7 @@ PREHOOK: query: create table alter_varchar2 ( ) partitioned by (hr int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alter_varchar2 POSTHOOK: query: create table alter_varchar2 ( c1 varchar(255) ) partitioned by (hr int) 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 2e142a3..0f3dd14 100644 --- a/ql/src/test/results/clientpositive/alter_view_rename.q.out +++ b/ql/src/test/results/clientpositive/alter_view_rename.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE invites (foo INT, bar STRING) PARTITIONED BY (ds STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@invites POSTHOOK: query: CREATE TABLE invites (foo INT, bar STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out b/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out index a811f81..c7254d1 100644 --- a/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out +++ b/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out @@ -9,6 +9,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE test1(name string, age int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@test1 POSTHOOK: query: CREATE TABLE test1(name string, age int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -16,6 +17,7 @@ POSTHOOK: Output: default@test1 PREHOOK: query: CREATE TABLE test2(name string) PARTITIONED by (age int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@test2 POSTHOOK: query: CREATE TABLE test2(name string) PARTITIONED by (age int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 ee93ef0..70df189 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_filter.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_filter.q.out @@ -6,6 +6,7 @@ PREHOOK: query: create table if not exists loc_staging ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_staging POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -18,6 +19,7 @@ POSTHOOK: Output: default@loc_staging PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_orc POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 224db28..9c37d9b 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out @@ -6,6 +6,7 @@ PREHOOK: query: create table if not exists loc_staging ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_staging POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -18,6 +19,7 @@ POSTHOOK: Output: default@loc_staging PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_orc POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 fba3664..507edd7 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_join.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_join.q.out @@ -5,6 +5,7 @@ PREHOOK: query: create table if not exists emp ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@emp POSTHOOK: query: create table if not exists emp ( lastname string, deptid int, @@ -19,6 +20,7 @@ PREHOOK: query: create table if not exists dept ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dept POSTHOOK: query: create table if not exists dept ( deptid int, deptname string @@ -34,6 +36,7 @@ PREHOOK: query: create table if not exists loc ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc POSTHOOK: query: create table if not exists loc ( state string, locid int, 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 24e6d18..b61a597 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_limit.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_limit.q.out @@ -6,6 +6,7 @@ PREHOOK: query: create table if not exists loc_staging ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_staging POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -18,6 +19,7 @@ POSTHOOK: Output: default@loc_staging PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_orc POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 e078ed4..10993c3 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_part.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_part.q.out @@ -6,6 +6,7 @@ PREHOOK: query: create table if not exists loc_staging ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_staging POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -30,6 +31,7 @@ PREHOOK: query: create table if not exists loc_orc ( ) partitioned by(year string) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_orc POSTHOOK: query: create table if not exists loc_orc ( state string, locid int, 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 9d4cf98..1b3b334 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_select.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_select.q.out @@ -19,6 +19,7 @@ collection items terminated by ',' map keys terminated by ':' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alltypes POSTHOOK: query: create table if not exists alltypes ( bo1 boolean, ti1 tinyint, @@ -44,6 +45,7 @@ POSTHOOK: Output: default@alltypes PREHOOK: query: create table alltypes_orc like alltypes PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@alltypes_orc POSTHOOK: query: create table alltypes_orc like alltypes POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 c804700..e0e7021 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_table.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_table.q.out @@ -4,6 +4,7 @@ PREHOOK: query: create table if not exists emp_staging ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@emp_staging POSTHOOK: query: create table if not exists emp_staging ( lastname string, deptid int @@ -14,6 +15,7 @@ POSTHOOK: Output: default@emp_staging PREHOOK: query: create table if not exists emp_orc like emp_staging PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@emp_orc POSTHOOK: query: create table if not exists emp_orc like emp_staging POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 8f0682d..1e8c46b 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_union.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_union.q.out @@ -6,6 +6,7 @@ PREHOOK: query: create table if not exists loc_staging ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_staging POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -18,6 +19,7 @@ POSTHOOK: Output: default@loc_staging PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@loc_orc POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -240,12 +242,16 @@ STAGE PLANS: PREHOOK: query: create database test PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:test POSTHOOK: query: create database test POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:test PREHOOK: query: use test PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:test POSTHOOK: query: use test POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:test PREHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -254,6 +260,7 @@ PREHOOK: query: create table if not exists loc_staging ( ) row format delimited fields terminated by '|' stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:test +PREHOOK: Output: test@loc_staging POSTHOOK: query: create table if not exists loc_staging ( state string, locid int, @@ -266,6 +273,7 @@ POSTHOOK: Output: test@loc_staging PREHOOK: query: create table loc_orc like loc_staging PREHOOK: type: CREATETABLE PREHOOK: Output: database:test +PREHOOK: Output: test@loc_orc POSTHOOK: query: create table loc_orc like loc_staging POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:test diff --git a/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out b/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out index 35cdfb6..7ed53cb 100644 --- a/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out +++ b/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out @@ -13,6 +13,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tstsrc POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -30,6 +31,7 @@ POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:st 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 +PREHOOK: Output: default@tstsrcpart 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 @@ -190,6 +192,7 @@ PARTITIONED by (ds STRING) CLUSTERED BY (key) INTO 10 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@harbucket POSTHOOK: query: CREATE TABLE harbucket(key INT) PARTITIONED by (ds STRING) CLUSTERED BY (key) INTO 10 BUCKETS @@ -273,6 +276,7 @@ PREHOOK: query: CREATE TABLE old_name(key INT) PARTITIONED by (ds STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@old_name POSTHOOK: query: CREATE TABLE old_name(key INT) PARTITIONED by (ds STRING) POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/archive_multi.q.out b/ql/src/test/results/clientpositive/archive_multi.q.out index 511f2bd..7e84def 100644 --- a/ql/src/test/results/clientpositive/archive_multi.q.out +++ b/ql/src/test/results/clientpositive/archive_multi.q.out @@ -9,6 +9,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table tstsrc like src PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tstsrc POSTHOOK: query: create table tstsrc like src POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -26,6 +27,7 @@ POSTHOOK: Lineage: tstsrc.value SIMPLE [(src)src.FieldSchema(name:value, type:st PREHOOK: query: create table tstsrcpart like srcpart PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tstsrcpart POSTHOOK: query: create table tstsrcpart like srcpart POSTHOOK: type: CREATETABLE POSTHOOK: Output: database: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 84cd005..44c2fbd 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,6 +1,7 @@ PREHOOK: query: create table src_autho_test (key STRING, value STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_autho_test POSTHOOK: query: create table src_autho_test (key STRING, value STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/authorization_2.q.out b/ql/src/test/results/clientpositive/authorization_2.q.out index fc586d9..0da0ec2 100644 --- a/ql/src/test/results/clientpositive/authorization_2.q.out +++ b/ql/src/test/results/clientpositive/authorization_2.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table authorization_part (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@authorization_part POSTHOOK: query: -- SORT_BEFORE_DIFF create table authorization_part (key int, value string) partitioned by (ds string) diff --git a/ql/src/test/results/clientpositive/authorization_5.q.out b/ql/src/test/results/clientpositive/authorization_5.q.out index 7da3d70..6e5187e 100644 --- a/ql/src/test/results/clientpositive/authorization_5.q.out +++ b/ql/src/test/results/clientpositive/authorization_5.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF CREATE DATABASE IF NOT EXISTS test_db COMMENT 'Hive test database' PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:test_db POSTHOOK: query: -- SORT_BEFORE_DIFF CREATE DATABASE IF NOT EXISTS test_db COMMENT 'Hive test database' POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:test_db PREHOOK: query: SHOW DATABASES PREHOOK: type: SHOWDATABASES POSTHOOK: query: SHOW DATABASES diff --git a/ql/src/test/results/clientpositive/authorization_6.q.out b/ql/src/test/results/clientpositive/authorization_6.q.out index d931eac..02c4109 100644 --- a/ql/src/test/results/clientpositive/authorization_6.q.out +++ b/ql/src/test/results/clientpositive/authorization_6.q.out @@ -12,6 +12,7 @@ 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 +PREHOOK: Output: default@authorization_part POSTHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -141,6 +142,7 @@ POSTHOOK: Output: default@authorization_part PREHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@authorization_part POSTHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/authorization_7.q.out b/ql/src/test/results/clientpositive/authorization_7.q.out index 1931ec8..00d3ee4 100644 --- a/ql/src/test/results/clientpositive/authorization_7.q.out +++ b/ql/src/test/results/clientpositive/authorization_7.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: GRANT_PRIVILEGE PREHOOK: query: CREATE TABLE src_authorization_7 (key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_authorization_7 POSTHOOK: query: CREATE TABLE src_authorization_7 (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -36,6 +37,7 @@ POSTHOOK: type: GRANT_PRIVILEGE PREHOOK: query: CREATE TABLE src_authorization_7 (key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@src_authorization_7 POSTHOOK: query: CREATE TABLE src_authorization_7 (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/authorization_8.q.out b/ql/src/test/results/clientpositive/authorization_8.q.out index f97c38f..47791fd 100644 --- a/ql/src/test/results/clientpositive/authorization_8.q.out +++ b/ql/src/test/results/clientpositive/authorization_8.q.out @@ -5,6 +5,7 @@ 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 +PREHOOK: Output: default@tbl_j5jbymsx8e POSTHOOK: query: CREATE TABLE tbl_j5jbymsx8e (key INT, value STRING) PARTITIONED BY (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/authorization_9.q.out b/ql/src/test/results/clientpositive/authorization_9.q.out index 2f7282c..7f95f5e 100644 --- a/ql/src/test/results/clientpositive/authorization_9.q.out +++ b/ql/src/test/results/clientpositive/authorization_9.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_BEFORE_DIFF create table dummy (key string, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dummy POSTHOOK: query: -- SORT_BEFORE_DIFF create table dummy (key string, value string) 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 d4f9555..5bf93ad 100644 --- a/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out +++ b/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@t1 POSTHOOK: query: -- actions from admin should work as if admin has all privileges create table t1(i int) diff --git a/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out b/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out index 34dbef8..be6f12a 100644 --- a/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out +++ b/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out @@ -1,9 +1,11 @@ PREHOOK: query: -- test commands such as dfs,add,delete,compile allowed only by admin user, after following statement use default PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:default POSTHOOK: query: -- test commands such as dfs,add,delete,compile allowed only by admin user, after following statement use default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: query: set role admin PREHOOK: type: SHOW_ROLES POSTHOOK: query: set role admin @@ -11,6 +13,7 @@ POSTHOOK: type: SHOW_ROLES PREHOOK: query: create table a_table1(a int, b int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@a_table1 POSTHOOK: query: create table a_table1(a int, b int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 08a6eca..7130db8 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,6 +1,7 @@ PREHOOK: query: create table create_table_creator_priv_test(i int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@create_table_creator_priv_test POSTHOOK: query: create table create_table_creator_priv_test(i int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/authorization_create_temp_table.q.out b/ql/src/test/results/clientpositive/authorization_create_temp_table.q.out index 5200fb1..b171d6c 100644 --- a/ql/src/test/results/clientpositive/authorization_create_temp_table.q.out +++ b/ql/src/test/results/clientpositive/authorization_create_temp_table.q.out @@ -14,6 +14,7 @@ POSTHOOK: Output: default@authorization_create_temp_table_1 PREHOOK: query: create temporary table tmp1(c1 string, c2 string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tmp1 POSTHOOK: query: create temporary table tmp1(c1 string, c2 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/authorization_explain.q.out b/ql/src/test/results/clientpositive/authorization_explain.q.out index 3aeb170..e5e605b 100644 --- a/ql/src/test/results/clientpositive/authorization_explain.q.out +++ b/ql/src/test/results/clientpositive/authorization_explain.q.out @@ -30,6 +30,7 @@ PREHOOK: type: SWITCHDATABASE POSTHOOK: query: explain authorization use default POSTHOOK: type: SWITCHDATABASE INPUTS: + database:default OUTPUTS: CURRENT_USER: hive_test_user @@ -39,4 +40,4 @@ PREHOOK: query: explain formatted authorization use default PREHOOK: type: SWITCHDATABASE POSTHOOK: query: explain formatted authorization use default POSTHOOK: type: SWITCHDATABASE -{"OUTPUTS":[],"INPUTS":[],"OPERATION":"SWITCHDATABASE","CURRENT_USER":"hive_test_user"} +{"OUTPUTS":[],"INPUTS":["database:default"],"OPERATION":"SWITCHDATABASE","CURRENT_USER":"hive_test_user"} diff --git a/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out b/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out index 846c3af..17b6c8a 100644 --- a/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out +++ b/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- current user has been set (comment line before the set cmd is CREATE TABLE t_gpr1(i int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t_gpr1 POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE t_gpr1(i int) 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 c33fb62..58ede72 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 @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@table_priv1 POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE table_priv1(i int) diff --git a/ql/src/test/results/clientpositive/authorization_index.q.out b/ql/src/test/results/clientpositive/authorization_index.q.out index 7318515..273931a 100644 --- a/ql/src/test/results/clientpositive/authorization_index.q.out +++ b/ql/src/test/results/clientpositive/authorization_index.q.out @@ -1,14 +1,17 @@ PREHOOK: query: create table t1 (a int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t1 POSTHOOK: query: create table t1 (a int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 PREHOOK: query: create index t1_index on table t1(a) as 'COMPACT' WITH DEFERRED REBUILD PREHOOK: type: CREATEINDEX +PREHOOK: Input: default@t1 POSTHOOK: query: create index t1_index on table t1(a) as 'COMPACT' WITH DEFERRED REBUILD POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@t1 POSTHOOK: Output: default@default__t1_t1_index__ PREHOOK: query: desc formatted default__t1_t1_index__ PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/authorization_insert.q.out b/ql/src/test/results/clientpositive/authorization_insert.q.out index 7aefbfe..d49e6c2 100644 --- a/ql/src/test/results/clientpositive/authorization_insert.q.out +++ b/ql/src/test/results/clientpositive/authorization_insert.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- current user has been set (comment line before the set cmd is CREATE TABLE t_auth_ins(i int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t_auth_ins POSTHOOK: query: -- current user has been set (comment line before the set cmd is resulting in parse error!!) CREATE TABLE t_auth_ins(i int) @@ -12,6 +13,7 @@ POSTHOOK: Output: default@t_auth_ins PREHOOK: query: CREATE TABLE t_select(i int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t_select POSTHOOK: query: CREATE TABLE t_select(i int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 6ce89e9..ad81888 100644 --- a/ql/src/test/results/clientpositive/authorization_owner_actions.q.out +++ b/ql/src/test/results/clientpositive/authorization_owner_actions.q.out @@ -2,6 +2,7 @@ create table t1(i int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t1 #### A masked pattern was here #### create table t1(i int) POSTHOOK: type: CREATETABLE @@ -26,6 +27,7 @@ POSTHOOK: Output: default@t1 PREHOOK: query: create table t1(i int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t1 POSTHOOK: query: create table t1(i int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out b/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out index f2d2691..2d4e37f 100644 --- a/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out +++ b/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out @@ -14,8 +14,10 @@ POSTHOOK: query: grant role testrole to user hrt_1 POSTHOOK: type: GRANT_ROLE PREHOOK: query: create database testdb PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:testdb POSTHOOK: query: create database testdb POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:testdb #### A masked pattern was here #### PREHOOK: type: ALTERDATABASE_OWNER PREHOOK: Output: database:testdb @@ -31,13 +33,16 @@ testdb location/in/test testrole ROLE -- create table use testdb PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:testdb #### A masked pattern was here #### -- create table use testdb POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:testdb PREHOOK: query: create table foobar (foo string, bar string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:testdb +PREHOOK: Output: testdb@foobar POSTHOOK: query: create table foobar (foo string, bar string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:testdb diff --git a/ql/src/test/results/clientpositive/authorization_parts.q.out b/ql/src/test/results/clientpositive/authorization_parts.q.out index 6c70744..bda6e83 100644 --- a/ql/src/test/results/clientpositive/authorization_parts.q.out +++ b/ql/src/test/results/clientpositive/authorization_parts.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@tpart POSTHOOK: query: -- check add partition without insert privilege create table tpart(i int, j int) partitioned by (k string) POSTHOOK: type: CREATETABLE 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 2f01568..187dc63 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 @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@table_priv_rev 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) diff --git a/ql/src/test/results/clientpositive/authorization_show_grant.q.out b/ql/src/test/results/clientpositive/authorization_show_grant.q.out index 717637e..2e7d7f6 100644 --- a/ql/src/test/results/clientpositive/authorization_show_grant.q.out +++ b/ql/src/test/results/clientpositive/authorization_show_grant.q.out @@ -26,6 +26,7 @@ PREHOOK: query: -- create table and grant privileges to a role create table t1(i int, j int, k int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t1 POSTHOOK: query: -- create table and grant privileges to a role create table t1(i int, j int, k int) POSTHOOK: type: CREATETABLE @@ -34,6 +35,7 @@ POSTHOOK: Output: default@t1 PREHOOK: query: create table t2(i int, j int, k int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t2 POSTHOOK: query: create table t2(i int, j int, k int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 a4b59b3..279554d 100644 --- a/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out +++ b/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- Test view authorization , and 'show grant' variants create table t1(i int, j int, k int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t1 POSTHOOK: query: -- Test view authorization , and 'show grant' variants create table t1(i int, j int, k int) diff --git a/ql/src/test/results/clientpositive/auto_join1.q.out b/ql/src/test/results/clientpositive/auto_join1.q.out index 13a2d6c..c0bdcdd 100644 --- a/ql/src/test/results/clientpositive/auto_join1.q.out +++ b/ql/src/test/results/clientpositive/auto_join1.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_j1 POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join14.q.out b/ql/src/test/results/clientpositive/auto_join14.q.out index 2ba47e9..5652060 100644 --- a/ql/src/test/results/clientpositive/auto_join14.q.out +++ b/ql/src/test/results/clientpositive/auto_join14.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE diff --git a/ql/src/test/results/clientpositive/auto_join17.q.out b/ql/src/test/results/clientpositive/auto_join17.q.out index 3c68f5d..0a68cb1 100644 --- a/ql/src/test/results/clientpositive/auto_join17.q.out +++ b/ql/src/test/results/clientpositive/auto_join17.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join19.q.out b/ql/src/test/results/clientpositive/auto_join19.q.out index eab7182..a7f0f6b 100644 --- a/ql/src/test/results/clientpositive/auto_join19.q.out +++ b/ql/src/test/results/clientpositive/auto_join19.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join2.q.out b/ql/src/test/results/clientpositive/auto_join2.q.out index 4e8a706..839f4a0 100644 --- a/ql/src/test/results/clientpositive/auto_join2.q.out +++ b/ql/src/test/results/clientpositive/auto_join2.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_j2 POSTHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join24.q.out b/ql/src/test/results/clientpositive/auto_join24.q.out index 33c98cd..1fa3e6e 100644 --- a/ql/src/test/results/clientpositive/auto_join24.q.out +++ b/ql/src/test/results/clientpositive/auto_join24.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table tst1(key STRING, cnt INT) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tst1 POSTHOOK: query: create table tst1(key STRING, cnt INT) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join25.q.out b/ql/src/test/results/clientpositive/auto_join25.q.out index 21188f8..08cbe42 100644 --- a/ql/src/test/results/clientpositive/auto_join25.q.out +++ b/ql/src/test/results/clientpositive/auto_join25.q.out @@ -2,6 +2,7 @@ PREHOOK: query: -- This test tests the scenario when the mapper dies. So, create CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 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 @@ -52,6 +53,7 @@ RUN: Stage-1:MAPRED PREHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_j2 POSTHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -94,6 +96,7 @@ RUN: Stage-1:MAPRED PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_j1 POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join26.q.out b/ql/src/test/results/clientpositive/auto_join26.q.out index 37fe6df..6f1ccae 100644 --- a/ql/src/test/results/clientpositive/auto_join26.q.out +++ b/ql/src/test/results/clientpositive/auto_join26.q.out @@ -3,6 +3,7 @@ PREHOOK: query: --SORT_QUERY_RESULTS CREATE TABLE dest_j1(key INT, cnt INT) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest_j1 POSTHOOK: query: --SORT_QUERY_RESULTS CREATE TABLE dest_j1(key INT, cnt INT) diff --git a/ql/src/test/results/clientpositive/auto_join3.q.out b/ql/src/test/results/clientpositive/auto_join3.q.out index 0c58f4c..78a7908 100644 --- a/ql/src/test/results/clientpositive/auto_join3.q.out +++ b/ql/src/test/results/clientpositive/auto_join3.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join32.q.out b/ql/src/test/results/clientpositive/auto_join32.q.out index 2267218..7fca969 100644 --- a/ql/src/test/results/clientpositive/auto_join32.q.out +++ b/ql/src/test/results/clientpositive/auto_join32.q.out @@ -2,6 +2,7 @@ PREHOOK: query: -- empty tables create table studenttab10k (name string, age int, gpa double) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@studenttab10k POSTHOOK: query: -- empty tables create table studenttab10k (name string, age int, gpa double) POSTHOOK: type: CREATETABLE @@ -10,6 +11,7 @@ POSTHOOK: Output: default@studenttab10k PREHOOK: query: create table votertab10k (name string, age int, registration string, contributions float) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@votertab10k POSTHOOK: query: create table votertab10k (name string, age int, registration string, contributions float) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -134,6 +136,7 @@ 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 +PREHOOK: Output: default@studenttab10k_smb 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 @@ -142,6 +145,7 @@ 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 +PREHOOK: Output: default@votertab10k_smb 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 @@ -350,6 +354,7 @@ 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 +PREHOOK: Output: default@studenttab10k_part 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 @@ -358,6 +363,7 @@ 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 +PREHOOK: Output: default@votertab10k_part 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 diff --git a/ql/src/test/results/clientpositive/auto_join4.q.out b/ql/src/test/results/clientpositive/auto_join4.q.out index 714e3ee..6624e93 100644 --- a/ql/src/test/results/clientpositive/auto_join4.q.out +++ b/ql/src/test/results/clientpositive/auto_join4.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join5.q.out b/ql/src/test/results/clientpositive/auto_join5.q.out index 17fbc9a..c0552d9 100644 --- a/ql/src/test/results/clientpositive/auto_join5.q.out +++ b/ql/src/test/results/clientpositive/auto_join5.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join6.q.out b/ql/src/test/results/clientpositive/auto_join6.q.out index 5c0b44b..c23fbde 100644 --- a/ql/src/test/results/clientpositive/auto_join6.q.out +++ b/ql/src/test/results/clientpositive/auto_join6.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join7.q.out b/ql/src/test/results/clientpositive/auto_join7.q.out index 5345f9c..7160729 100644 --- a/ql/src/test/results/clientpositive/auto_join7.q.out +++ b/ql/src/test/results/clientpositive/auto_join7.q.out @@ -1,6 +1,7 @@ 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 +PREHOOK: Output: default@dest1 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 diff --git a/ql/src/test/results/clientpositive/auto_join8.q.out b/ql/src/test/results/clientpositive/auto_join8.q.out index ea52872..a33a81c 100644 --- a/ql/src/test/results/clientpositive/auto_join8.q.out +++ b/ql/src/test/results/clientpositive/auto_join8.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/auto_join9.q.out b/ql/src/test/results/clientpositive/auto_join9.q.out index 63762df..609277a 100644 --- a/ql/src/test/results/clientpositive/auto_join9.q.out +++ b/ql/src/test/results/clientpositive/auto_join9.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 690fa1e..a8c0221 100644 --- a/ql/src/test/results/clientpositive/auto_join_filters.q.out +++ b/ql/src/test/results/clientpositive/auto_join_filters.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE myinput1(key int, value int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@myinput1 POSTHOOK: query: CREATE TABLE myinput1(key int, value int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -254,6 +255,7 @@ POSTHOOK: Input: default@myinput1 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 +PREHOOK: Output: default@smb_input1 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 @@ -261,6 +263,7 @@ 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 +PREHOOK: Output: default@smb_input2 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 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 b61f8a0..7abde8f 100644 --- a/ql/src/test/results/clientpositive/auto_join_nulls.q.out +++ b/ql/src/test/results/clientpositive/auto_join_nulls.q.out @@ -1,6 +1,7 @@ PREHOOK: query: CREATE TABLE myinput1(key int, value int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@myinput1 POSTHOOK: query: CREATE TABLE myinput1(key int, value int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 37b626c..03cdcb5 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 @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@testsrc POSTHOOK: query: -- HIVE-5056 RS has expression list for values, but it's ignored in MapJoinProcessor create table testsrc ( `key` int,`val` string) @@ -24,6 +25,7 @@ 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 +PREHOOK: Output: default@orderpayment_small POSTHOOK: query: create table orderpayment_small (`dealid` int,`date` string,`time` string, `cityid` int, `userid` int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -48,6 +50,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: create table user_small( userid int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@user_small POSTHOOK: query: create table user_small( userid int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 7463991..7690041 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 @@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tbl1 POSTHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS @@ -12,6 +13,7 @@ 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 +PREHOOK: Output: default@tbl2 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 @@ -1357,6 +1359,7 @@ POSTHOOK: Input: default@tbl2 PREHOOK: query: CREATE TABLE dest1(key int, value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -1364,6 +1367,7 @@ POSTHOOK: Output: default@dest1 PREHOOK: query: CREATE TABLE dest2(key int, val1 string, val2 string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest2 POSTHOOK: query: CREATE TABLE dest2(key int, val1 string, val2 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -1647,6 +1651,7 @@ POSTHOOK: Output: default@dest2 PREHOOK: query: CREATE TABLE dest2(key int, cnt int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest2 POSTHOOK: query: CREATE TABLE dest2(key int, cnt int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 3f36792..5a7f174 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 @@ -4,6 +4,7 @@ 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 +PREHOOK: Output: default@bucket_small POSTHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) @@ -31,6 +32,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 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 3b791af..488fc50 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,6 +1,7 @@ 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 +PREHOOK: Output: default@tbl1 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 @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@tbl2 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 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 21bb3a4..8372a63 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 @@ -3,6 +3,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -29,6 +30,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 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 dc8bd87..eaf6c15 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 @@ -4,6 +4,7 @@ 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 +PREHOOK: Output: default@bucket_small POSTHOOK: query: -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) @@ -31,6 +32,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 @@ -105,6 +107,7 @@ PREHOOK: query: CREATE TABLE bucket_medium (key string, value string) partitione CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@bucket_medium 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 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 ab82fea..37d31c3 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 @@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tbl1 POSTHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS @@ -12,6 +13,7 @@ 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 +PREHOOK: Output: default@tbl2 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 @@ -39,6 +41,7 @@ POSTHOOK: Lineage: tbl2.value SIMPLE [(src)src.FieldSchema(name:value, type:stri PREHOOK: query: CREATE TABLE dest1(k1 int, k2 int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(k1 int, k2 int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -46,6 +49,7 @@ POSTHOOK: Output: default@dest1 PREHOOK: query: CREATE TABLE dest2(k1 string, k2 string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest2 POSTHOOK: query: CREATE TABLE dest2(k1 string, k2 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database: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 12628eb..69bd43a 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,6 +1,7 @@ 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 +PREHOOK: Output: default@tbl1 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 @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@tbl2 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 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 082a690..10b20d8 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,6 +1,7 @@ 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 +PREHOOK: Output: default@tbl1 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 @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@tbl2 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 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 fffbd53..72242bb 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -43,6 +44,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 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 7578180..35fa02f 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -44,6 +45,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 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 a04e7d0..4fea70d 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -76,6 +77,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 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 31fb798..30a8436 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -42,6 +43,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 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 2dae094..1747119 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,6 +1,7 @@ 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 +PREHOOK: Output: default@tbl1 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 @@ -8,6 +9,7 @@ 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 +PREHOOK: Output: default@tbl2 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 @@ -15,6 +17,7 @@ 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 +PREHOOK: Output: default@tbl3 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 @@ -22,6 +25,7 @@ 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 +PREHOOK: Output: default@tbl4 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 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 5b6521b..abb1db4 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -76,6 +77,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 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 59fef22..9226dc6 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 @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -44,6 +45,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 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 2a01f4b..95b264f 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 @@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@tbl1 POSTHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS @@ -12,6 +13,7 @@ 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 +PREHOOK: Output: default@tbl2 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 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 4a9569d..5d52d21 100644 --- a/ql/src/test/results/clientpositive/avro_change_schema.q.out +++ b/ql/src/test/results/clientpositive/avro_change_schema.q.out @@ -14,6 +14,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ "namespace": "org.apache.hive", ] }') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@avro2 POSTHOOK: query: -- verify that we can update the table properties CREATE TABLE avro2 ROW FORMAT 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 2352640..bcb967a 100644 --- a/ql/src/test/results/clientpositive/avro_compression_enabled.q.out +++ b/ql/src/test/results/clientpositive/avro_compression_enabled.q.out @@ -36,6 +36,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ }') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@doctors4 POSTHOOK: query: -- verify that new joins bring in correct schemas (including evolved schemas) CREATE TABLE doctors4 diff --git a/ql/src/test/results/clientpositive/avro_compression_enabled_native.q.out b/ql/src/test/results/clientpositive/avro_compression_enabled_native.q.out index b8fa61e..687f17e 100644 --- a/ql/src/test/results/clientpositive/avro_compression_enabled_native.q.out +++ b/ql/src/test/results/clientpositive/avro_compression_enabled_native.q.out @@ -8,6 +8,7 @@ CREATE TABLE doctors4 ( STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@doctors4 POSTHOOK: query: -- verify that new joins bring in correct schemas (including evolved schemas) CREATE TABLE doctors4 ( diff --git a/ql/src/test/results/clientpositive/avro_decimal.q.out b/ql/src/test/results/clientpositive/avro_decimal.q.out index 1868de3..88268ce 100644 --- a/ql/src/test/results/clientpositive/avro_decimal.q.out +++ b/ql/src/test/results/clientpositive/avro_decimal.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE dec(name string, value decimal(8,4)) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dec POSTHOOK: query: CREATE TABLE dec(name string, value decimal(8,4)) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -54,6 +55,7 @@ TBLPROPERTIES ( ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@avro_dec POSTHOOK: query: CREATE TABLE `avro_dec`( `name` string COMMENT 'from deserializer', `value` decimal(5,2) COMMENT 'from deserializer') @@ -127,6 +129,7 @@ TBLPROPERTIES ( ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@avro_dec1 POSTHOOK: query: CREATE TABLE `avro_dec1`( `name` string COMMENT 'from deserializer', `value` decimal(4,1) COMMENT 'from deserializer') diff --git a/ql/src/test/results/clientpositive/avro_decimal_native.q.out b/ql/src/test/results/clientpositive/avro_decimal_native.q.out index bc87a7d..c8ae0fb 100644 --- a/ql/src/test/results/clientpositive/avro_decimal_native.q.out +++ b/ql/src/test/results/clientpositive/avro_decimal_native.q.out @@ -7,6 +7,7 @@ PREHOOK: query: CREATE TABLE dec ( value decimal(8,4)) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dec POSTHOOK: query: CREATE TABLE dec ( name string, value decimal(8,4)) @@ -49,6 +50,7 @@ COMMENT 'just drop the schema right into the HQL' STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@avro_dec POSTHOOK: query: CREATE TABLE avro_dec( name string, value decimal(5,2)) @@ -104,6 +106,7 @@ COMMENT 'just drop the schema right into the HQL' STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@avro_dec1 POSTHOOK: query: CREATE TABLE avro_dec1( name string, value decimal(4,1)) 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 568f344..2f81b1a 100644 --- a/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out +++ b/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out @@ -37,6 +37,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ }') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@doctors_with_new_field POSTHOOK: query: -- SORT_QUERY_RESULTS -- verify that new fields in schema get propagated to table scans diff --git a/ql/src/test/results/clientpositive/avro_joins.q.out b/ql/src/test/results/clientpositive/avro_joins.q.out index eba7eb9..7e47fe0 100644 --- a/ql/src/test/results/clientpositive/avro_joins.q.out +++ b/ql/src/test/results/clientpositive/avro_joins.q.out @@ -38,6 +38,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ }') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@doctors4 POSTHOOK: query: -- SORT_QUERY_RESULTS -- verify that new joins bring in correct schemas (including evolved schemas) @@ -127,6 +128,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ }') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@episodes POSTHOOK: query: CREATE TABLE episodes ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe' diff --git a/ql/src/test/results/clientpositive/avro_joins_native.q.out b/ql/src/test/results/clientpositive/avro_joins_native.q.out index 39d3c97..ca22a72 100644 --- a/ql/src/test/results/clientpositive/avro_joins_native.q.out +++ b/ql/src/test/results/clientpositive/avro_joins_native.q.out @@ -9,6 +9,7 @@ CREATE TABLE doctors4 ( STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@doctors4 POSTHOOK: query: -- SORT_QUERY_RESULTS -- verify that new joins bring in correct schemas (including evolved schemas) @@ -45,6 +46,7 @@ PREHOOK: query: CREATE TABLE episodes ( STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@episodes POSTHOOK: query: CREATE TABLE episodes ( title string COMMENT "episode title", air_date string COMMENT "initial date", diff --git a/ql/src/test/results/clientpositive/avro_native.q.out b/ql/src/test/results/clientpositive/avro_native.q.out index 68bb9c5..2de4df1 100644 --- a/ql/src/test/results/clientpositive/avro_native.q.out +++ b/ql/src/test/results/clientpositive/avro_native.q.out @@ -8,6 +8,7 @@ CREATE TABLE doctors ( STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@doctors POSTHOOK: query: -- SORT_QUERY_RESULTS -- verify that we can actually read avro files 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 d3e55a2..5dbec57 100644 --- a/ql/src/test/results/clientpositive/avro_nullable_fields.q.out +++ b/ql/src/test/results/clientpositive/avro_nullable_fields.q.out @@ -18,6 +18,7 @@ CREATE TABLE test_serializer(string1 STRING, STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@test_serializer POSTHOOK: query: -- Verify that nullable fields properly work CREATE TABLE test_serializer(string1 STRING, int1 INT, @@ -83,6 +84,7 @@ PREHOOK: query: CREATE TABLE as_avro ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@as_avro POSTHOOK: query: CREATE TABLE as_avro ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe' diff --git a/ql/src/test/results/clientpositive/avro_partitioned.q.out b/ql/src/test/results/clientpositive/avro_partitioned.q.out index 108714b..890cd9f 100644 --- a/ql/src/test/results/clientpositive/avro_partitioned.q.out +++ b/ql/src/test/results/clientpositive/avro_partitioned.q.out @@ -30,6 +30,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ }') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@episodes POSTHOOK: query: -- SORT_QUERY_RESULTS -- Verify that table scans work with partitioned Avro tables CREATE TABLE episodes @@ -102,6 +103,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ }') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@episodes_partitioned POSTHOOK: query: CREATE TABLE episodes_partitioned PARTITIONED BY (doctor_pt INT) ROW FORMAT @@ -305,6 +307,7 @@ 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 +PREHOOK: Output: default@episodes_partitioned_serdeproperties POSTHOOK: query: -- Verify that reading from an Avro partition works -- even if it has an old schema relative to the current table level schema diff --git a/ql/src/test/results/clientpositive/avro_partitioned_native.q.out b/ql/src/test/results/clientpositive/avro_partitioned_native.q.out index 3af8d9e..c02c656 100644 --- a/ql/src/test/results/clientpositive/avro_partitioned_native.q.out +++ b/ql/src/test/results/clientpositive/avro_partitioned_native.q.out @@ -7,6 +7,7 @@ CREATE TABLE episodes ( STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@episodes POSTHOOK: query: -- SORT_QUERY_RESULTS -- Verify that table scans work with partitioned Avro tables CREATE TABLE episodes ( @@ -33,6 +34,7 @@ PARTITIONED BY (doctor_pt INT) STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@episodes_partitioned POSTHOOK: query: CREATE TABLE episodes_partitioned ( title string COMMENT "episode title", air_date string COMMENT "initial date", 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 8528bc5..687579e 100644 --- a/ql/src/test/results/clientpositive/avro_sanity_test.q.out +++ b/ql/src/test/results/clientpositive/avro_sanity_test.q.out @@ -31,6 +31,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ }') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@doctors POSTHOOK: query: -- SORT_QUERY_RESULTS -- verify that we can actually read avro files 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 1ead961..967a847 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 @@ -8,6 +8,7 @@ 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 +PREHOOK: Output: default@avro_with_no_schema POSTHOOK: query: -- verify we get the sentinel schema if we don't provide one CREATE TABLE avro_with_no_schema diff --git a/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out b/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out index f471601..84d8051 100644 --- a/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out +++ b/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out @@ -7,6 +7,7 @@ CREATE TABLE episodes ( STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@episodes POSTHOOK: query: -- SORT_QUERY_RESULTS -- Verify that table scans work with partitioned Avro tables CREATE TABLE episodes ( @@ -33,6 +34,7 @@ PARTITIONED BY (doctor_pt INT) STORED AS AVRO PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@episodes_partitioned POSTHOOK: query: CREATE TABLE episodes_partitioned ( title string COMMENT "episode title", air_date string COMMENT "initial date", 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 0553717..b13694d 100644 --- a/ql/src/test/results/clientpositive/avro_schema_literal.q.out +++ b/ql/src/test/results/clientpositive/avro_schema_literal.q.out @@ -30,6 +30,7 @@ TBLPROPERTIES ('avro.schema.literal'='{ ] }') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@avro1 POSTHOOK: query: CREATE TABLE avro1 ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe' diff --git a/ql/src/test/results/clientpositive/ba_table1.q.out b/ql/src/test/results/clientpositive/ba_table1.q.out index d35e6ee..14862a7 100644 --- a/ql/src/test/results/clientpositive/ba_table1.q.out +++ b/ql/src/test/results/clientpositive/ba_table1.q.out @@ -11,6 +11,7 @@ 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 +PREHOOK: Output: default@ba_test 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) diff --git a/ql/src/test/results/clientpositive/ba_table2.q.out b/ql/src/test/results/clientpositive/ba_table2.q.out index 9574016..4159648 100644 --- a/ql/src/test/results/clientpositive/ba_table2.q.out +++ b/ql/src/test/results/clientpositive/ba_table2.q.out @@ -11,6 +11,7 @@ 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 +PREHOOK: Output: default@ba_test POSTHOOK: query: -- All the test in ba_test1.q + using LazyBinarySerde instead of LazySimpleSerde create table ba_test (ba_key binary, ba_val binary) diff --git a/ql/src/test/results/clientpositive/ba_table3.q.out b/ql/src/test/results/clientpositive/ba_table3.q.out index 5492e6d..e1089d3 100644 --- a/ql/src/test/results/clientpositive/ba_table3.q.out +++ b/ql/src/test/results/clientpositive/ba_table3.q.out @@ -7,6 +7,7 @@ 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 +PREHOOK: Output: default@ba_test 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) 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 0be108a..26eb165 100644 --- a/ql/src/test/results/clientpositive/ba_table_udfs.q.out +++ b/ql/src/test/results/clientpositive/ba_table_udfs.q.out @@ -2,15 +2,18 @@ PREHOOK: query: -- SORT_QUERY_RESULTS USE default PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:default POSTHOOK: query: -- SORT_QUERY_RESULTS USE default POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:default PREHOOK: query: CREATE TABLE dest1(bytes1 BINARY, bytes2 BINARY, string STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: CREATE TABLE dest1(bytes1 BINARY, bytes2 BINARY, string STRING) 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 7c6725a..706a537 100644 --- a/ql/src/test/results/clientpositive/ba_table_union.q.out +++ b/ql/src/test/results/clientpositive/ba_table_union.q.out @@ -6,6 +6,7 @@ PREHOOK: query: -- this query tests ba_table1.q + nested queries with multiple o create table ba_test (ba_key binary, ba_val binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@ba_test 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 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 294aabb..b42222d 100644 --- a/ql/src/test/results/clientpositive/binary_output_format.q.out +++ b/ql/src/test/results/clientpositive/binary_output_format.q.out @@ -10,6 +10,7 @@ STORED AS OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveBinaryOutputFormat' PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@dest1 POSTHOOK: query: -- Create a table with binary output format CREATE TABLE dest1(mydata STRING) ROW FORMAT SERDE 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 570a46a..24c5edc 100644 --- a/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out +++ b/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out @@ -7,6 +7,7 @@ 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 +PREHOOK: Output: default@ba_test POSTHOOK: query: -- Tests everything in binary_table_colserde.q + uses LazyBinaryColumnarSerde create table ba_test (ba_key binary, ba_val binary) stored as rcfile 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 6c6169c..3a026f3 100644 --- a/ql/src/test/results/clientpositive/binary_table_colserde.q.out +++ b/ql/src/test/results/clientpositive/binary_table_colserde.q.out @@ -7,6 +7,7 @@ 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 +PREHOOK: Output: default@ba_test POSTHOOK: query: -- Everything in ba_table1.q + columnar serde in RCFILE. create table ba_test (ba_key binary, ba_val binary) stored as rcfile diff --git a/ql/src/test/results/clientpositive/binarysortable_1.q.out b/ql/src/test/results/clientpositive/binarysortable_1.q.out index 632dca1..7ff3fd4 100644 --- a/ql/src/test/results/clientpositive/binarysortable_1.q.out +++ b/ql/src/test/results/clientpositive/binarysortable_1.q.out @@ -4,6 +4,7 @@ FIELDS TERMINATED BY '9' STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@mytable POSTHOOK: query: CREATE TABLE mytable(key STRING, value STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '9' diff --git a/ql/src/test/results/clientpositive/bool_literal.q.out b/ql/src/test/results/clientpositive/bool_literal.q.out index 59dff8c..f9b816c 100644 --- a/ql/src/test/results/clientpositive/bool_literal.q.out +++ b/ql/src/test/results/clientpositive/bool_literal.q.out @@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE PREHOOK: query: CREATE TABLE bool_literal(key int, value boolean) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@bool_literal POSTHOOK: query: CREATE TABLE bool_literal(key int, value boolean) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/bucket1.q.out b/ql/src/test/results/clientpositive/bucket1.q.out index 17451ae..6737a85 100644 --- a/ql/src/test/results/clientpositive/bucket1.q.out +++ b/ql/src/test/results/clientpositive/bucket1.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE bucket1_1(key int, value string) CLUSTERED BY (key) INTO 100 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@bucket1_1 POSTHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE bucket1_1(key int, value string) CLUSTERED BY (key) INTO 100 BUCKETS diff --git a/ql/src/test/results/clientpositive/bucket2.q.out b/ql/src/test/results/clientpositive/bucket2.q.out index f16e2af..a945d8e 100644 --- a/ql/src/test/results/clientpositive/bucket2.q.out +++ b/ql/src/test/results/clientpositive/bucket2.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE bucket2_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@bucket2_1 POSTHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE bucket2_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS diff --git a/ql/src/test/results/clientpositive/bucket3.q.out b/ql/src/test/results/clientpositive/bucket3.q.out index 551a98d..e81ef66 100644 --- a/ql/src/test/results/clientpositive/bucket3.q.out +++ b/ql/src/test/results/clientpositive/bucket3.q.out @@ -3,6 +3,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS 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 +PREHOOK: Output: default@bucket3_1 POSTHOOK: query: -- SORT_QUERY_RESULTS CREATE TABLE bucket3_1(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS diff --git a/ql/src/test/results/clientpositive/bucket_groupby.q.out b/ql/src/test/results/clientpositive/bucket_groupby.q.out index ba0f8d8..2f04051 100644 --- a/ql/src/test/results/clientpositive/bucket_groupby.q.out +++ b/ql/src/test/results/clientpositive/bucket_groupby.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@clustergroupby POSTHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -995,6 +996,7 @@ POSTHOOK: Output: default@clustergroupby PREHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@clustergroupby POSTHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -1293,6 +1295,7 @@ POSTHOOK: Output: default@clustergroupby PREHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@clustergroupby POSTHOOK: query: create table clustergroupby(key string, value string) partitioned by(ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/bucket_if_with_path_filter.q.out b/ql/src/test/results/clientpositive/bucket_if_with_path_filter.q.out index 38792a6..b4ca9e6 100644 --- a/ql/src/test/results/clientpositive/bucket_if_with_path_filter.q.out +++ b/ql/src/test/results/clientpositive/bucket_if_with_path_filter.q.out @@ -2,6 +2,7 @@ PREHOOK: type: CREATETABLE #### A masked pattern was here #### PREHOOK: Output: database:default +PREHOOK: Output: default@t1 #### A masked pattern was here #### POSTHOOK: type: CREATETABLE #### A masked pattern was here #### @@ -10,6 +11,7 @@ POSTHOOK: Output: default@t1 PREHOOK: query: Create table t2 (dt string) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@t2 POSTHOOK: query: Create table t2 (dt string) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database: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 63fb0d1..b194a2b 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 @@ -10,6 +10,7 @@ PREHOOK: query: create table table1(key string, value string) clustered by (key, sorted by (key, value) into 1 BUCKETS stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@table1 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 @@ -19,6 +20,7 @@ PREHOOK: query: create table table2(key string, value string) clustered by (valu sorted by (value, key) into 1 BUCKETS stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@table2 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 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 21f2d5a..07c8878 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 @@ -10,6 +10,7 @@ PREHOOK: query: create table table1(key string, value string) clustered by (key, sorted by (key desc, value desc) into 1 BUCKETS stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@table1 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 @@ -19,6 +20,7 @@ PREHOOK: query: create table table2(key string, value string) clustered by (valu sorted by (value desc, key desc) into 1 BUCKETS stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@table2 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 diff --git a/ql/src/test/results/clientpositive/bucketcontext_1.q.out b/ql/src/test/results/clientpositive/bucketcontext_1.q.out index 5212de3..0ea304d 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -27,6 +28,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 diff --git a/ql/src/test/results/clientpositive/bucketcontext_2.q.out b/ql/src/test/results/clientpositive/bucketcontext_2.q.out index d86c430..e961f06 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -43,6 +44,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 diff --git a/ql/src/test/results/clientpositive/bucketcontext_3.q.out b/ql/src/test/results/clientpositive/bucketcontext_3.q.out index a536e8b..1de6211 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -44,6 +45,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out b/ql/src/test/results/clientpositive/bucketcontext_4.q.out index 26c8720..f0e369d 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -76,6 +77,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out b/ql/src/test/results/clientpositive/bucketcontext_5.q.out index 2619cfb..085cce9 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -42,6 +43,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out b/ql/src/test/results/clientpositive/bucketcontext_6.q.out index 4c42ca7..209be0a 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -42,6 +43,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out b/ql/src/test/results/clientpositive/bucketcontext_7.q.out index 7e5afb5..11054d6 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out @@ -2,6 +2,7 @@ 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 +PREHOOK: Output: default@bucket_small 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 @@ -76,6 +77,7 @@ 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 +PREHOOK: Output: default@bucket_big 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 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 10702fd..56addee 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,6 +1,7 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 d6f6809..b17d509 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,6 +1,7 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -32,15 +33,20 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_department POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:importer 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 b0c7a94..99ccf43 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 @@ -5,6 +5,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_employee 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") @@ -43,12 +44,16 @@ POSTHOOK: Input: default@exim_employee POSTHOOK: Output: default@exim_employee PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: 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") @@ -56,6 +61,7 @@ PREHOOK: query: create table exim_employee ( emp_id int comment "employee id") tblproperties("creator"="krishna") PREHOOK: type: CREATETABLE PREHOOK: Output: database:importer +PREHOOK: Output: importer@exim_employee 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") 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 5ef4f77..c7225f7 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,6 +1,7 @@ PREHOOK: query: create table exim_department ( dep_id int) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@exim_department POSTHOOK: query: create table exim_department ( dep_id int) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -32,12 +33,16 @@ POSTHOOK: Input: default@exim_department POSTHOOK: Output: default@exim_department PREHOOK: query: create database importer PREHOOK: type: CREATEDATABASE +PREHOOK: Output: database:importer POSTHOOK: query: create database importer POSTHOOK: type: CREATEDATABASE +POSTHOOK: Output: database:importer PREHOOK: query: use importer PREHOOK: type: SWITCHDATABASE +PREHOOK: Input: database:importer POSTHOOK: query: use importer POSTHOOK: type: SWITCHDATABASE +POSTHOOK: Input: database:importer PREHOOK: query: grant Create on database importer to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE POSTHOOK: query: grant Create on database importer to user hive_test_user diff --git a/ql/src/test/results/clientpositive/index_auth.q.out b/ql/src/test/results/clientpositive/index_auth.q.out index f2289e8..385b639 100644 --- a/ql/src/test/results/clientpositive/index_auth.q.out +++ b/ql/src/test/results/clientpositive/index_auth.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table foobar(key int, value string) PARTITIONED BY (ds string, hr string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@foobar POSTHOOK: query: create table foobar(key int, value string) PARTITIONED BY (ds string, hr string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -14,8 +15,10 @@ 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 +PREHOOK: Input: default@foobar POSTHOOK: query: CREATE INDEX srcpart_AUTH_index ON TABLE foobar(key) as 'BITMAP' WITH DEFERRED REBUILD POSTHOOK: type: CREATEINDEX +POSTHOOK: Input: default@foobar POSTHOOK: Output: default@default__foobar_srcpart_auth_index__ PREHOOK: query: SHOW INDEXES ON foobar PREHOOK: type: SHOWINDEXES @@ -62,8 +65,10 @@ POSTHOOK: Lineage: default__foobar_srcpart_auth_index__ PARTITION(ds=2008-04-08, POSTHOOK: Lineage: default__foobar_srcpart_auth_index__ PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(foobar)foobar.FieldSchema(name:key, type:int, comment:null), ] PREHOOK: query: DROP INDEX srcpart_auth_index on foobar PREHOOK: type: DROPINDEX +PREHOOK: Input: default@foobar POSTHOOK: query: DROP INDEX srcpart_auth_index on foobar POSTHOOK: type: DROPINDEX +POSTHOOK: Input: default@foobar PREHOOK: query: DROP TABLE foobar PREHOOK: type: DROPTABLE PREHOOK: Input: default@foobar 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 65f954f..8ec7e62 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,6 +1,7 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@hive_test_src POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default 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 f3b8d49..6ed6f9c 100644 --- a/ql/src/test/results/clientpositive/load_nonpart_authsuccess.q.out +++ b/ql/src/test/results/clientpositive/load_nonpart_authsuccess.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table hive_test_src ( col1 string ) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@hive_test_src POSTHOOK: query: create table hive_test_src ( col1 string ) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database: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 75f0609..8249dce 100644 --- a/ql/src/test/results/clientpositive/load_part_authsuccess.q.out +++ b/ql/src/test/results/clientpositive/load_part_authsuccess.q.out @@ -1,6 +1,7 @@ PREHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default +PREHOOK: Output: default@hive_test_src POSTHOOK: query: create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default