You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2014/09/12 20:59:08 UTC
svn commit: r1624615 - in /hive/trunk:
common/src/java/org/apache/hadoop/hive/common/
ql/src/java/org/apache/hadoop/hive/ql/parse/
ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/
ql/src/test/queries/clientnegative/ ql/src/te...
Author: thejas
Date: Fri Sep 12 18:59:07 2014
New Revision: 1624615
URL: http://svn.apache.org/r1624615
Log:
HIVE-8019 : Missing hive 0.13.1 commit in trunk : export/import statement authorization - CVE-2014-0228
Added:
hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_export.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_import.q
hive/trunk/ql/src/test/results/clientnegative/authorization_uri_export.q.out
hive/trunk/ql/src/test/results/clientnegative/authorization_uri_import.q.out
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
hive/trunk/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
hive/trunk/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_01_nonpart.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_02_part.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_04_all_part.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_05_some_part.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_06_one_part.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_10_external_managed.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_11_managed_external.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_12_external_location.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_13_managed_location.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_15_external_part.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_16_part_external.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_17_part_managed.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_18_part_external.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_hidden_files.q.out
hive/trunk/ql/src/test/results/clientpositive/import_exported_table.q.out
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java (original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java Fri Sep 12 18:59:07 2014
@@ -446,12 +446,26 @@ public final class FileUtils {
public static boolean isLocalFile(HiveConf conf, String fileName) {
try {
// do best effor to determine if this is a local file
- FileSystem fsForFile = FileSystem.get(new URI(fileName), conf);
- return LocalFileSystem.class.isInstance(fsForFile);
+ return isLocalFile(conf, new URI(fileName));
} catch (URISyntaxException e) {
LOG.warn("Unable to create URI from " + fileName, e);
+ }
+ return false;
+ }
+
+ /**
+ * A best effort attempt to determine if if the file is a local file
+ * @param conf
+ * @param fileUri
+ * @return true if it was successfully able to determine that it is a local file
+ */
+ public static boolean isLocalFile(HiveConf conf, URI fileUri) {
+ try {
+ // do best effor to determine if this is a local file
+ FileSystem fsForFile = FileSystem.get(fileUri, conf);
+ return LocalFileSystem.class.isInstance(fsForFile);
} catch (IOException e) {
- LOG.warn("Unable to get FileSystem for " + fileName, e);
+ LOG.warn("Unable to get FileSystem for " + fileUri, e);
}
return false;
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java Fri Sep 12 18:59:07 2014
@@ -28,6 +28,7 @@ import org.antlr.runtime.tree.Tree;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.common.FileUtils;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.ErrorMsg;
import org.apache.hadoop.hive.ql.exec.Task;
@@ -70,7 +71,7 @@ public class ExportSemanticAnalyzer exte
"Target is not a directory : " + toURI));
} else {
FileStatus[] files = fs.listStatus(toPath);
- if (files != null) {
+ if (files != null && files.length != 0) {
throw new SemanticException(ErrorMsg.INVALID_PATH.getMsg(ast,
"Target is not an empty directory : " + toURI));
}
@@ -120,6 +121,7 @@ public class ExportSemanticAnalyzer exte
rootTasks.add(rTask);
inputs.add(new ReadEntity(ts.tableHandle));
}
- outputs.add(new WriteEntity(parentPath, toURI.getScheme().equals("hdfs")));
+ boolean isLocal = FileUtils.isLocalFile(conf, toURI);
+ outputs.add(new WriteEntity(parentPath, isLocal));
}
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java Fri Sep 12 18:59:07 2014
@@ -18,11 +18,24 @@
package org.apache.hadoop.hive.ql.parse;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
import org.antlr.runtime.tree.Tree;
import org.apache.commons.lang.ObjectUtils;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.common.FileUtils;
import org.apache.hadoop.hive.common.JavaUtils;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.TableType;
@@ -35,21 +48,22 @@ import org.apache.hadoop.hive.ql.ErrorMs
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.exec.TaskFactory;
import org.apache.hadoop.hive.ql.exec.Utilities;
+import org.apache.hadoop.hive.ql.hooks.ReadEntity;
import org.apache.hadoop.hive.ql.hooks.WriteEntity;
import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils;
import org.apache.hadoop.hive.ql.io.HiveOutputFormat;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.metadata.InvalidTableException;
import org.apache.hadoop.hive.ql.metadata.Table;
-import org.apache.hadoop.hive.ql.plan.*;
+import org.apache.hadoop.hive.ql.plan.AddPartitionDesc;
+import org.apache.hadoop.hive.ql.plan.CopyWork;
+import org.apache.hadoop.hive.ql.plan.CreateTableDesc;
+import org.apache.hadoop.hive.ql.plan.DDLWork;
+import org.apache.hadoop.hive.ql.plan.LoadTableDesc;
+import org.apache.hadoop.hive.ql.plan.MoveWork;
import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hadoop.hive.serde.serdeConstants;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.*;
-
/**
* ImportSemanticAnalyzer.
*
@@ -82,6 +96,8 @@ public class ImportSemanticAnalyzer exte
List<AddPartitionDesc> partitionDescs = new ArrayList<AddPartitionDesc>();
Path fromPath = new Path(fromURI.getScheme(), fromURI.getAuthority(),
fromURI.getPath());
+ boolean isLocal = FileUtils.isLocalFile(conf, fromURI);
+ inputs.add(new ReadEntity(fromPath, isLocal));
try {
Path metadataPath = new Path(fromPath, METADATA_NAME);
Map.Entry<org.apache.hadoop.hive.metastore.api.Table,
@@ -475,7 +491,7 @@ public class ImportSemanticAnalyzer exte
String importedSerdeFormat = tableDesc.getSerdeProps().get(
serdeConstants.SERIALIZATION_FORMAT);
/*
- * If Imported SerdeFormat is null, then set it to "1" just as
+ * If Imported SerdeFormat is null, then set it to "1" just as
* metadata.Table.getEmptyTable
*/
importedSerdeFormat = importedSerdeFormat == null ? "1" : importedSerdeFormat;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java Fri Sep 12 18:59:07 2014
@@ -267,9 +267,9 @@ public class Operation2Privilege {
// select with grant for exporting contents
op2Priv.put(HiveOperationType.EXPORT, PrivRequirement.newIOPrivRequirement
-(SEL_GRANT_AR, null));
+(SEL_GRANT_AR, OWNER_INS_SEL_DEL_NOGRANT_AR));
op2Priv.put(HiveOperationType.IMPORT, PrivRequirement.newIOPrivRequirement
-(INS_NOGRANT_AR, null));
+(OWNER_INS_SEL_DEL_NOGRANT_AR, INS_NOGRANT_AR));
// operations require select priv
op2Priv.put(HiveOperationType.SHOWCOLUMNS, PrivRequirement.newIOPrivRequirement
Added: hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_export.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_export.q?rev=1624615&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_export.q (added)
+++ hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_export.q Fri Sep 12 18:59:07 2014
@@ -0,0 +1,23 @@
+set hive.test.authz.sstd.hs2.mode=true;
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
+set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
+set hive.security.authorization.enabled=true;
+
+set hive.test.mode=true;
+set hive.test.mode.prefix=;
+set hive.test.mode.nosamplelist=export_auth_uri;
+
+
+create table export_auth_uri ( dep_id int comment "department id")
+ stored as textfile;
+
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/export_auth_uri/temp;
+dfs -rmr target/tmp/ql/test/data/exports/export_auth_uri;
+
+
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/export_auth_uri/;
+dfs -chmod 555 target/tmp/ql/test/data/exports/export_auth_uri;
+
+export table export_auth_uri to 'ql/test/data/exports/export_auth_uri';
+
+-- Attempt to export to location without sufficient permissions should fail
Added: hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_import.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_import.q?rev=1624615&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_import.q (added)
+++ hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_import.q Fri Sep 12 18:59:07 2014
@@ -0,0 +1,26 @@
+set hive.test.authz.sstd.hs2.mode=true;
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
+set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
+set hive.security.authorization.enabled=true;
+
+set hive.test.mode=true;
+set hive.test.mode.prefix=;
+set hive.test.mode.nosamplelist=import_auth_uri;
+
+
+create table import_auth_uri ( dep_id int comment "department id")
+ stored as textfile;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/import_auth_uri/temp;
+dfs -rmr target/tmp/ql/test/data/exports/import_auth_uri;
+export table import_auth_uri to 'ql/test/data/exports/import_auth_uri';
+drop table import_auth_uri;
+
+dfs -touchz target/tmp/ql/test/data/exports/import_auth_uri/1.txt;
+dfs -chmod 555 target/tmp/ql/test/data/exports/import_auth_uri/1.txt;
+
+create database importer;
+use importer;
+
+import from 'ql/test/data/exports/import_auth_uri';
+
+-- Attempt to import from location without sufficient permissions should fail
Modified: hive/trunk/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q Fri Sep 12 18:59:07 2014
@@ -1,3 +1,6 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
+set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
+
set hive.test.mode=true;
set hive.test.mode.prefix=;
set hive.test.mode.nosamplelist=exim_department,exim_employee;
Added: hive/trunk/ql/src/test/results/clientnegative/authorization_uri_export.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_uri_export.q.out?rev=1624615&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_uri_export.q.out (added)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_uri_export.q.out Fri Sep 12 18:59:07 2014
@@ -0,0 +1,11 @@
+PREHOOK: query: create table export_auth_uri ( dep_id int comment "department id")
+ stored as textfile
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@export_auth_uri
+POSTHOOK: query: create table export_auth_uri ( dep_id int comment "department id")
+ stored as textfile
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@export_auth_uri
+#### A masked pattern was here ####
Added: hive/trunk/ql/src/test/results/clientnegative/authorization_uri_import.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_uri_import.q.out?rev=1624615&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_uri_import.q.out (added)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_uri_import.q.out Fri Sep 12 18:59:07 2014
@@ -0,0 +1,11 @@
+PREHOOK: query: create table import_auth_uri ( dep_id int comment "department id")
+ stored as textfile
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@import_auth_uri
+POSTHOOK: query: create table import_auth_uri ( dep_id int comment "department id")
+ stored as textfile
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@import_auth_uri
+#### A masked pattern was here ####
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out Fri Sep 12 18:59:07 2014
@@ -41,8 +41,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: describe extended exim_department
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_01_nonpart.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_01_nonpart.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_01_nonpart.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_01_nonpart.q.out Fri Sep 12 18:59:07 2014
@@ -49,8 +49,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: describe extended exim_department
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out Fri Sep 12 18:59:07 2014
@@ -43,8 +43,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
PREHOOK: query: describe extended exim_employee
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_02_part.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_02_part.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_02_part.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_02_part.q.out Fri Sep 12 18:59:07 2014
@@ -56,8 +56,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn
PREHOOK: query: describe extended exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out Fri Sep 12 18:59:07 2014
@@ -61,9 +61,11 @@ POSTHOOK: Output: database:importer
POSTHOOK: Output: importer@exim_department
PREHOOK: query: import from 'ql/test/data/exports/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
PREHOOK: Output: importer@exim_department
POSTHOOK: query: import from 'ql/test/data/exports/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: describe extended exim_department
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_04_all_part.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_04_all_part.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_04_all_part.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_04_all_part.q.out Fri Sep 12 18:59:07 2014
@@ -95,8 +95,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out Fri Sep 12 18:59:07 2014
@@ -101,8 +101,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_05_some_part.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_05_some_part.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_05_some_part.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_05_some_part.q.out Fri Sep 12 18:59:07 2014
@@ -91,8 +91,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka
POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=ka
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_06_one_part.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_06_one_part.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_06_one_part.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_06_one_part.q.out Fri Sep 12 18:59:07 2014
@@ -89,8 +89,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka
PREHOOK: query: describe extended exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out Fri Sep 12 18:59:07 2014
@@ -122,9 +122,11 @@ POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=al
PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
PREHOOK: Output: importer@exim_employee
POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out Fri Sep 12 18:59:07 2014
@@ -72,8 +72,10 @@ POSTHOOK: Output: importer@exim_departme
POSTHOOK: Output: importer@exim_department@emp_org=hr
PREHOOK: query: import table exim_imported_dept from 'ql/test/data/exports/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import table exim_imported_dept from 'ql/test/data/exports/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_imported_dept
PREHOOK: query: describe extended exim_imported_dept
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out Fri Sep 12 18:59:07 2014
@@ -133,9 +133,11 @@ POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka
PREHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn") from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
PREHOOK: Output: importer@exim_employee
POSTHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn") from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: describe extended exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_10_external_managed.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_10_external_managed.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_10_external_managed.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_10_external_managed.q.out Fri Sep 12 18:59:07 2014
@@ -55,8 +55,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: describe extended exim_department
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_11_managed_external.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_11_managed_external.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_11_managed_external.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_11_managed_external.q.out Fri Sep 12 18:59:07 2014
@@ -49,8 +49,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import external table exim_department from 'ql/test/data/exports/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import external table exim_department from 'ql/test/data/exports/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: describe extended exim_department
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_12_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_12_external_location.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_12_external_location.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_12_external_location.q.out Fri Sep 12 18:59:07 2014
@@ -51,9 +51,11 @@ POSTHOOK: Input: database:importer
PREHOOK: query: import external table exim_department from 'ql/test/data/exports/exim_department'
location 'ql/test/data/tablestore/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import external table exim_department from 'ql/test/data/exports/exim_department'
location 'ql/test/data/tablestore/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: describe extended exim_department
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_13_managed_location.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_13_managed_location.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_13_managed_location.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_13_managed_location.q.out Fri Sep 12 18:59:07 2014
@@ -51,9 +51,11 @@ POSTHOOK: Input: database:importer
PREHOOK: query: import table exim_department from 'ql/test/data/exports/exim_department'
location 'ql/test/data/tablestore/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import table exim_department from 'ql/test/data/exports/exim_department'
location 'ql/test/data/tablestore/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: describe extended exim_department
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out Fri Sep 12 18:59:07 2014
@@ -67,10 +67,12 @@ POSTHOOK: Output: importer@exim_departme
PREHOOK: query: import table exim_department from 'ql/test/data/exports/exim_department'
location 'ql/test/data/tablestore/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
PREHOOK: Output: importer@exim_department
POSTHOOK: query: import table exim_department from 'ql/test/data/exports/exim_department'
location 'ql/test/data/tablestore/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: describe extended exim_department
PREHOOK: type: DESCTABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_15_external_part.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_15_external_part.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_15_external_part.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_15_external_part.q.out Fri Sep 12 18:59:07 2014
@@ -139,10 +139,12 @@ POSTHOOK: Output: importer@exim_employee
PREHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn")
from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
PREHOOK: Output: importer@exim_employee
POSTHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn")
from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: describe extended exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_16_part_external.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_16_part_external.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_16_part_external.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_16_part_external.q.out Fri Sep 12 18:59:07 2014
@@ -118,11 +118,13 @@ PREHOOK: query: import table exim_employ
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
PREHOOK: Output: importer@exim_employee
POSTHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn")
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: show table extended like exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_17_part_managed.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_17_part_managed.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_17_part_managed.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_17_part_managed.q.out Fri Sep 12 18:59:07 2014
@@ -114,11 +114,13 @@ PREHOOK: query: import table exim_employ
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
PREHOOK: Output: importer@exim_employee
POSTHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn")
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: alter table exim_employee add partition (emp_country="us", emp_state="ap")
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_18_part_external.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_18_part_external.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_18_part_external.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_18_part_external.q.out Fri Sep 12 18:59:07 2014
@@ -96,9 +96,11 @@ POSTHOOK: Input: database:importer
PREHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn")
from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn")
from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: describe extended exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out Fri Sep 12 18:59:07 2014
@@ -72,10 +72,12 @@ PREHOOK: query: import external table ex
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import external table exim_employee
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=ka
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out Fri Sep 12 18:59:07 2014
@@ -98,10 +98,12 @@ PREHOOK: query: import external table ex
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import external table exim_employee partition (emp_country="us", emp_state="tn")
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: describe extended exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out Fri Sep 12 18:59:07 2014
@@ -98,10 +98,12 @@ PREHOOK: query: import table exim_employ
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import table exim_employee partition (emp_country="us", emp_state="tn")
from 'ql/test/data/exports/exim_employee'
location 'ql/test/data/tablestore/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: describe extended exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out Fri Sep 12 18:59:07 2014
@@ -65,9 +65,11 @@ POSTHOOK: type: GRANT_PRIVILEGE
POSTHOOK: Output: importer@exim_department
PREHOOK: query: import from 'ql/test/data/exports/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
PREHOOK: Output: importer@exim_department
POSTHOOK: query: import from 'ql/test/data/exports/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: select * from exim_department
PREHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out Fri Sep 12 18:59:07 2014
@@ -84,9 +84,11 @@ POSTHOOK: type: GRANT_PRIVILEGE
POSTHOOK: Output: importer@exim_employee
PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
PREHOOK: Output: importer@exim_employee
POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in/emp_state=tn
PREHOOK: query: select * from exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out Fri Sep 12 18:59:07 2014
@@ -49,8 +49,10 @@ POSTHOOK: query: grant Create on databas
POSTHOOK: type: GRANT_PRIVILEGE
PREHOOK: query: import from 'ql/test/data/exports/exim_department'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_department'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_department
PREHOOK: query: select * from exim_department
PREHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/exim_hidden_files.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exim_hidden_files.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exim_hidden_files.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/exim_hidden_files.q.out Fri Sep 12 18:59:07 2014
@@ -45,8 +45,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:importer
PREHOOK: query: import from 'ql/test/data/exports/exim_employee'
PREHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: query: import from 'ql/test/data/exports/exim_employee'
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: importer@exim_employee
POSTHOOK: Output: importer@exim_employee@emp_country=in
PREHOOK: query: describe formatted exim_employee
Modified: hive/trunk/ql/src/test/results/clientpositive/import_exported_table.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/import_exported_table.q.out?rev=1624615&r1=1624614&r2=1624615&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/import_exported_table.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/import_exported_table.q.out Fri Sep 12 18:59:07 2014
@@ -2,6 +2,7 @@
PREHOOK: type: IMPORT
#### A masked pattern was here ####
POSTHOOK: type: IMPORT
+#### A masked pattern was here ####
POSTHOOK: Output: default@j1_41
PREHOOK: query: DESCRIBE j1_41
PREHOOK: type: DESCTABLE