hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gunt...@apache.org
Subject svn commit: r1553112 - in /hive/branches/tez: ./ beeline/src/java/org/apache/hive/beeline/ beeline/src/test/org/apache/hive/beeline/src/test/ data/files/ itests/hive-unit/src/test/java/org/apache/hive/beeline/ ql/src/java/org/apache/hadoop/hive/ql/ ql/...
Date Mon, 23 Dec 2013 13:40:49 GMT
Author: gunther
Date: Mon Dec 23 13:40:48 2013
New Revision: 1553112

URL: http://svn.apache.org/r1553112
Log:
Merge latest trunk into branch. (Gunther Hagleitner)

Added:
    hive/branches/tez/data/files/person+age.txt
      - copied unchanged from r1553109, hive/trunk/data/files/person+age.txt
    hive/branches/tez/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
      - copied unchanged from r1553109, hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java
      - copied unchanged from r1553109, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java
    hive/branches/tez/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q
      - copied unchanged from r1553109, hive/trunk/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q
    hive/branches/tez/ql/src/test/queries/clientnegative/subquery_shared_alias.q
      - copied unchanged from r1553109, hive/trunk/ql/src/test/queries/clientnegative/subquery_shared_alias.q
    hive/branches/tez/ql/src/test/queries/clientnegative/subquery_unqual_corr_expr.q
      - copied unchanged from r1553109, hive/trunk/ql/src/test/queries/clientnegative/subquery_unqual_corr_expr.q
    hive/branches/tez/ql/src/test/queries/clientpositive/join_alt_syntax.q
      - copied unchanged from r1553109, hive/trunk/ql/src/test/queries/clientpositive/join_alt_syntax.q
    hive/branches/tez/ql/src/test/queries/clientpositive/subquery_views.q
      - copied unchanged from r1553109, hive/trunk/ql/src/test/queries/clientpositive/subquery_views.q
    hive/branches/tez/ql/src/test/results/clientnegative/join_alt_syntax_comma_on.q.out
      - copied unchanged from r1553109, hive/trunk/ql/src/test/results/clientnegative/join_alt_syntax_comma_on.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/subquery_shared_alias.q.out
      - copied unchanged from r1553109, hive/trunk/ql/src/test/results/clientnegative/subquery_shared_alias.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/subquery_unqual_corr_expr.q.out
      - copied unchanged from r1553109, hive/trunk/ql/src/test/results/clientnegative/subquery_unqual_corr_expr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join_alt_syntax.q.out
      - copied unchanged from r1553109, hive/trunk/ql/src/test/results/clientpositive/join_alt_syntax.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/subquery_views.q.out
      - copied unchanged from r1553109, hive/trunk/ql/src/test/results/clientpositive/subquery_views.q.out
Removed:
    hive/branches/tez/beeline/src/test/org/apache/hive/beeline/src/test/TestBeeLineWithArgs.java
Modified:
    hive/branches/tez/   (props changed)
    hive/branches/tez/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java
    hive/branches/tez/data/files/person age.txt
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Context.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/CopyTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/CopyWork.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadFileDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadTableDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java
    hive/branches/tez/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q
    hive/branches/tez/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q
    hive/branches/tez/ql/src/test/queries/clientpositive/timestamp_3.q
    hive/branches/tez/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/load_hdfs_file_with_space_in_the_name.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/timestamp_3.q.out
    hive/branches/tez/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/groupby1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml

Propchange: hive/branches/tez/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1552842-1553109

Modified: hive/branches/tez/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java (original)
+++ hive/branches/tez/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java Mon Dec 23 13:40:48 2013
@@ -70,7 +70,7 @@ class DatabaseConnection {
       if (url.indexOf("#") == -1) {
         sb.append("#");
       } else {
-        sb.append("&");
+        sb.append(";");
       }
       Set<Map.Entry<String, String>> vars = hiveVars.entrySet();
       Iterator<Map.Entry<String, String>> it = vars.iterator();
@@ -80,7 +80,7 @@ class DatabaseConnection {
         sb.append("=");
         sb.append(var.getValue());
         if (it.hasNext()) {
-          sb.append("&");
+          sb.append(";");
         }
       }
     }

Modified: hive/branches/tez/data/files/person age.txt
URL: http://svn.apache.org/viewvc/hive/branches/tez/data/files/person%20age.txt?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/data/files/person age.txt (original)
+++ hive/branches/tez/data/files/person age.txt Mon Dec 23 13:40:48 2013
@@ -1,5 +1,5 @@
-John	23
-Tom	17
-Jim	31
-Boby	9
-Paul	51
\ No newline at end of file
+John23
+Tom17
+Jim31
+Boby9
+Paul51

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Context.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Context.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Context.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Context.java Mon Dec 23 13:40:48 2013
@@ -78,7 +78,7 @@ public class Context {
   private final String scratchDirPermission;
 
   // Keeps track of scratch directories created for different scheme/authority
-  private final Map<String, String> fsScratchDirs = new HashMap<String, String>();
+  private final Map<String, Path> fsScratchDirs = new HashMap<String, Path>();
 
   private final Configuration conf;
   protected int pathid = 10000;
@@ -189,11 +189,11 @@ public class Context {
    * @param mkdir create the directory if true
    * @param scratchDir path of tmp directory
    */
-  private String getScratchDir(String scheme, String authority,
+  private Path getScratchDir(String scheme, String authority,
                                boolean mkdir, String scratchDir) {
 
     String fileSystem =  scheme + ":" + authority;
-    String dir = fsScratchDirs.get(fileSystem + "-" + TaskRunner.getTaskRunnerID());
+    Path dir = fsScratchDirs.get(fileSystem + "-" + TaskRunner.getTaskRunnerID());
 
     if (dir == null) {
       Path dirPath = new Path(scheme, authority,
@@ -216,7 +216,7 @@ public class Context {
           throw new RuntimeException (e);
         }
       }
-      dir = dirPath.toString();
+      dir = dirPath;
       fsScratchDirs.put(fileSystem + "-" + TaskRunner.getTaskRunnerID(), dir);
 
     }
@@ -227,7 +227,7 @@ public class Context {
   /**
    * Create a local scratch directory on demand and return it.
    */
-  public String getLocalScratchDir(boolean mkdir) {
+  public Path getLocalScratchDir(boolean mkdir) {
     try {
       FileSystem fs = FileSystem.getLocal(conf);
       URI uri = fs.getUri();
@@ -243,7 +243,7 @@ public class Context {
    * Create a map-reduce scratch directory on demand and return it.
    *
    */
-  public String getMRScratchDir() {
+  public Path getMRScratchDir() {
 
     // if we are executing entirely on the client side - then
     // just (re)use the local scratch directory
@@ -254,7 +254,7 @@ public class Context {
     try {
       Path dir = FileUtils.makeQualified(nonLocalScratchPath, conf);
       URI uri = dir.toUri();
-      String newScratchDir = getScratchDir(uri.getScheme(), uri.getAuthority(),
+      Path newScratchDir = getScratchDir(uri.getScheme(), uri.getAuthority(),
                            !explain, uri.getPath());
       LOG.info("New scratch dir is " + newScratchDir);
       return newScratchDir;
@@ -266,7 +266,7 @@ public class Context {
     }
   }
 
-  private String getExternalScratchDir(URI extURI) {
+  private Path getExternalScratchDir(URI extURI) {
     return getScratchDir(extURI.getScheme(), extURI.getAuthority(),
                          !explain, nonLocalScratchPath.toUri().getPath());
   }
@@ -275,9 +275,9 @@ public class Context {
    * Remove any created scratch directories.
    */
   private void removeScratchDir() {
-    for (Map.Entry<String, String> entry : fsScratchDirs.entrySet()) {
+    for (Map.Entry<String, Path> entry : fsScratchDirs.entrySet()) {
       try {
-        Path p = new Path(entry.getValue());
+        Path p = entry.getValue();
         p.getFileSystem(conf).delete(p, true);
       } catch (Exception e) {
         LOG.warn("Error Removing Scratch: "
@@ -328,7 +328,7 @@ public class Context {
    */
   public String localizeMRTmpFileURI(String originalURI) {
     Path o = new Path(originalURI);
-    Path mrbase = new Path(getMRScratchDir());
+    Path mrbase = getMRScratchDir();
 
     URI relURI = mrbase.toUri().relativize(o.toUri());
     if (relURI.equals(o.toUri())) {

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/CopyTask.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/CopyTask.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/CopyTask.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/CopyTask.java Mon Dec 23 13:40:48 2013
@@ -26,7 +26,6 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hive.ql.Context;
 import org.apache.hadoop.hive.ql.DriverContext;
 import org.apache.hadoop.hive.ql.parse.LoadSemanticAnalyzer;
 import org.apache.hadoop.hive.ql.plan.CopyWork;
@@ -51,8 +50,8 @@ public class CopyTask extends Task<CopyW
     FileSystem dstFs = null;
     Path toPath = null;
     try {
-      Path fromPath = new Path(work.getFromPath());
-      toPath = new Path(work.getToPath());
+      Path fromPath = work.getFromPath();
+      toPath = work.getToPath();
 
       console.printInfo("Copying data from " + fromPath.toString(), " to "
           + toPath.toString());
@@ -61,7 +60,6 @@ public class CopyTask extends Task<CopyW
       dstFs = toPath.getFileSystem(conf);
 
       FileStatus[] srcs = LoadSemanticAnalyzer.matchFilesOrDir(srcFs, fromPath);
-
       if (srcs == null || srcs.length == 0) {
         if (work.isErrorOnSrcEmpty()) {
           console.printError("No files matching path: " + fromPath.toString());

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java Mon Dec 23 13:40:48 2013
@@ -252,7 +252,7 @@ public class MoveTask extends Task<MoveW
           FileSystem fs;
           try {
             fs = FileSystem.get(table.getDataLocation(), conf);
-            dirs = fs.globStatus(new Path(tbd.getSourceDir()));
+            dirs = fs.globStatus(tbd.getSourcePath());
             files = new ArrayList<FileStatus>();
             for (int i = 0; (dirs != null && i < dirs.length); i++) {
               files.addAll(Arrays.asList(fs.listStatus(dirs[i].getPath())));

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java Mon Dec 23 13:40:48 2013
@@ -127,7 +127,7 @@ public class TezTask extends Task<TezWor
 
       // we will localize all the files (jars, plans, hashtables) to the
       // scratch dir. let's create this first.
-      Path scratchDir = new Path(ctx.getMRScratchDir());
+      Path scratchDir = ctx.getMRScratchDir();
 
       // create the tez tmp dir
       utils.createTezDir(scratchDir, conf);

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java Mon Dec 23 13:40:48 2013
@@ -1223,7 +1223,7 @@ public final class GenMapRedUtils {
     // 2. Constructing a conditional task consisting of a move task and a map reduce task
     //
     MoveWork dummyMv = new MoveWork(null, null, null,
-        new LoadFileDesc(fsInputDesc.getFinalDirName(), finalName, true, null, null), false);
+         new LoadFileDesc(new Path(fsInputDesc.getFinalDirName()), finalName, true, null, null), false);
     MapWork cplan;
     Serializable work;
 

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java Mon Dec 23 13:40:48 2013
@@ -1012,7 +1012,7 @@ public class DDLSemanticAnalyzer extends
         // so the operation is atomic.
         String queryTmpdir = ctx.getExternalTmpFileURI(newTblPartLoc.toUri());
         truncateTblDesc.setOutputDir(queryTmpdir);
-        LoadTableDesc ltd = new LoadTableDesc(queryTmpdir, queryTmpdir, tblDesc,
+        LoadTableDesc ltd = new LoadTableDesc(new Path(queryTmpdir), queryTmpdir, tblDesc,
             partSpec == null ? new HashMap<String, String>() : partSpec);
         ltd.setLbCtx(lbCtx);
         Task<MoveWork> moveTsk = TaskFactory.get(new MoveWork(null, null, ltd, null, false),
@@ -1627,7 +1627,7 @@ public class DDLSemanticAnalyzer extends
       TableDesc tblDesc = Utilities.getTableDesc(tblObj);
       String queryTmpdir = ctx.getExternalTmpFileURI(newTblPartLoc.toUri());
       mergeDesc.setOutputDir(queryTmpdir);
-      LoadTableDesc ltd = new LoadTableDesc(queryTmpdir, queryTmpdir, tblDesc,
+      LoadTableDesc ltd = new LoadTableDesc(new Path(queryTmpdir), queryTmpdir, tblDesc,
           partSpec == null ? new HashMap<String, String>() : partSpec);
       ltd.setLbCtx(lbCtx);
       Task<MoveWork> moveTsk = TaskFactory.get(new MoveWork(null, null, ltd, null, false),

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java Mon Dec 23 13:40:48 2013
@@ -91,7 +91,7 @@ public class ExportSemanticAnalyzer exte
       Path path = new Path(tmpfile, "_metadata");
       EximUtil.createExportDump(FileSystem.getLocal(conf), path, ts.tableHandle, partitions);
       Task<? extends Serializable> rTask = TaskFactory.get(new CopyWork(
-          path.toString(), toURI.toString(), false), conf);
+          path, new Path(toURI), false), conf);
       rootTasks.add(rTask);
       LOG.debug("_metadata file written into " + path.toString()
           + " and then copied to " + toURI.toString());
@@ -108,7 +108,7 @@ public class ExportSemanticAnalyzer exte
         URI fromURI = partition.getDataLocation();
         Path toPartPath = new Path(parentPath, partition.getName());
         Task<? extends Serializable> rTask = TaskFactory.get(
-            new CopyWork(fromURI.toString(), toPartPath.toString(), false),
+            new CopyWork(new Path(fromURI), toPartPath, false),
             conf);
         rootTasks.add(rTask);
         inputs.add(new ReadEntity(partition));
@@ -117,7 +117,7 @@ public class ExportSemanticAnalyzer exte
       URI fromURI = ts.tableHandle.getDataLocation();
       Path toDataPath = new Path(parentPath, "data");
       Task<? extends Serializable> rTask = TaskFactory.get(new CopyWork(
-          fromURI.toString(), toDataPath.toString(), false), conf);
+          new Path(fromURI), toDataPath, false), conf);
       rootTasks.add(rTask);
       inputs.add(new ReadEntity(ts.tableHandle));
     }

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g Mon Dec 23 13:40:48 2013
@@ -86,7 +86,7 @@ fromClause
 joinSource
 @init { gParent.msgs.push("join source"); }
 @after { gParent.msgs.pop(); }
-    : fromSource ( joinToken^ fromSource (KW_ON! expression)? )*
+    : fromSource ( joinToken^ fromSource ( KW_ON! expression {$joinToken.start.getType() != COMMA}? )? )*
     | uniqueJoinToken^ uniqueJoinSource (COMMA! uniqueJoinSource)+
     ;
 
@@ -114,6 +114,7 @@ joinToken
     :
       KW_JOIN                      -> TOK_JOIN
     | KW_INNER KW_JOIN             -> TOK_JOIN
+    | COMMA                        -> TOK_JOIN
     | KW_CROSS KW_JOIN             -> TOK_CROSSJOIN
     | KW_LEFT  (KW_OUTER)? KW_JOIN -> TOK_LEFTOUTERJOIN
     | KW_RIGHT (KW_OUTER)? KW_JOIN -> TOK_RIGHTOUTERJOIN
@@ -125,10 +126,10 @@ lateralView
 @init {gParent.msgs.push("lateral view"); }
 @after {gParent.msgs.pop(); }
 	:
-	KW_LATERAL KW_VIEW KW_OUTER function tableAlias (KW_AS identifier (COMMA identifier)*)?
+	KW_LATERAL KW_VIEW KW_OUTER function tableAlias (KW_AS identifier ((COMMA)=> COMMA identifier)*)?
 	-> ^(TOK_LATERAL_VIEW_OUTER ^(TOK_SELECT ^(TOK_SELEXPR function identifier* tableAlias)))
 	|
-	KW_LATERAL KW_VIEW function tableAlias (KW_AS identifier (COMMA identifier)*)?
+	KW_LATERAL KW_VIEW function tableAlias (KW_AS identifier ((COMMA)=> COMMA identifier)*)?
 	-> ^(TOK_LATERAL_VIEW ^(TOK_SELECT ^(TOK_SELEXPR function identifier* tableAlias)))
 	;
 

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java Mon Dec 23 13:40:48 2013
@@ -281,10 +281,10 @@ public class ImportSemanticAnalyzer exte
 
   private Task<?> loadTable(URI fromURI, Table table) {
     Path dataPath = new Path(fromURI.toString(), "data");
-    String tmpURI = ctx.getExternalTmpFileURI(fromURI);
-    Task<?> copyTask = TaskFactory.get(new CopyWork(dataPath.toString(),
-        tmpURI, false), conf);
-    LoadTableDesc loadTableWork = new LoadTableDesc(tmpURI.toString(),
+    Path tmpPath = new Path(ctx.getExternalTmpFileURI(fromURI));
+    Task<?> copyTask = TaskFactory.get(new CopyWork(dataPath,
+       tmpPath, false), conf);
+    LoadTableDesc loadTableWork = new LoadTableDesc(tmpPath,
         ctx.getExternalTmpFileURI(fromURI),
         Utilities.getTableDesc(table), new TreeMap<String, String>(),
         false);
@@ -326,12 +326,12 @@ public class ImportSemanticAnalyzer exte
       LOG.debug("adding dependent CopyWork/AddPart/MoveWork for partition "
           + partSpecToString(addPartitionDesc.getPartSpec())
           + " with source location: " + srcLocation);
-      String tmpURI = ctx.getExternalTmpFileURI(fromURI);
-      Task<?> copyTask = TaskFactory.get(new CopyWork(srcLocation,
-          tmpURI, false), conf);
+      Path tmpPath = new Path(ctx.getExternalTmpFileURI(fromURI));
+      Task<?> copyTask = TaskFactory.get(new CopyWork(new Path(srcLocation),
+          tmpPath, false), conf);
       Task<?> addPartTask = TaskFactory.get(new DDLWork(getInputs(),
           getOutputs(), addPartitionDesc), conf);
-      LoadTableDesc loadTableWork = new LoadTableDesc(tmpURI,
+      LoadTableDesc loadTableWork = new LoadTableDesc(tmpPath,
           ctx.getExternalTmpFileURI(fromURI),
           Utilities.getTableDesc(table),
           addPartitionDesc.getPartSpec(), true);

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java Mon Dec 23 13:40:48 2013
@@ -27,8 +27,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.antlr.runtime.tree.Tree;
-import org.apache.commons.httpclient.URIException;
-import org.apache.commons.httpclient.util.URIUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
@@ -84,7 +82,7 @@ public class LoadSemanticAnalyzer extend
     // directory
     if (!path.startsWith("/")) {
       if (isLocal) {
-        path = URIUtil.decode( new Path(System.getProperty("user.dir"), path).toUri().toString() );
+        path = new Path(System.getProperty("user.dir"), fromPath).toString();
       } else {
         path = new Path(new Path("/user/" + System.getProperty("user.name")),
           path).toString();
@@ -125,10 +123,7 @@ public class LoadSemanticAnalyzer extend
     }
 
     try {
-      FileStatus[] srcs = matchFilesOrDir(FileSystem.get(fromURI, conf),
-          new Path(fromURI.getScheme(), fromURI.getAuthority(), fromURI
-          .getPath()));
-
+      FileStatus[] srcs = matchFilesOrDir(FileSystem.get(fromURI, conf), new Path(fromURI));
       if (srcs == null || srcs.length == 0) {
         throw new SemanticException(ErrorMsg.INVALID_PATH.getMsg(ast,
             "No files matching path " + fromURI));
@@ -233,13 +228,7 @@ public class LoadSemanticAnalyzer extend
       // that's just a test case.
       String copyURIStr = ctx.getExternalTmpFileURI(toURI);
       URI copyURI = URI.create(copyURIStr);
-      try {
-        rTask = TaskFactory.get(new CopyWork(URIUtil.decode(fromURI.toString()), copyURIStr),
-            conf);
-      } catch (URIException e) {
-        throw new SemanticException(ErrorMsg.INVALID_PATH.getMsg(fromTree, e
-            .getMessage()), e);
-      }
+      rTask = TaskFactory.get(new CopyWork(new Path(fromURI), new Path(copyURI)), conf);
       fromURI = copyURI;
     }
 
@@ -269,13 +258,8 @@ public class LoadSemanticAnalyzer extend
 
 
     LoadTableDesc loadTableWork;
-    try {
-      loadTableWork = new LoadTableDesc(URIUtil.decode(fromURI.toString()),
+    loadTableWork = new LoadTableDesc(new Path(fromURI),
           loadTmpPath, Utilities.getTableDesc(ts.tableHandle), partSpec, isOverWrite);
-    } catch (URIException e1) {
-      throw new SemanticException(ErrorMsg.INVALID_PATH.getMsg(fromTree, e1
-          .getMessage()), e1);
-    }
 
     Task<? extends Serializable> childTask = TaskFactory.get(new MoveWork(getInputs(),
         getOutputs(), loadTableWork, null, true), conf);

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java Mon Dec 23 13:40:48 2013
@@ -2,6 +2,7 @@ package org.apache.hadoop.hive.ql.parse;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.Stack;
 
 import org.apache.hadoop.hive.common.ObjectPair;
@@ -375,12 +376,14 @@ public class QBSubQuery implements ISubQ
     }
     
     public ASTNode getSubQueryAST() {
-      return SubQueryUtils.buildNotInNullCheckQuery(
+      ASTNode ast = SubQueryUtils.buildNotInNullCheckQuery(
           QBSubQuery.this.getSubQueryAST(), 
           QBSubQuery.this.getAlias(), 
           CNT_ALIAS, 
           subQryCorrExprs,
           sqRR);
+      SubQueryUtils.setOriginDeep(ast, QBSubQuery.this.originalSQASTOrigin);
+      return ast;
     }
     
     public String getAlias() {
@@ -392,8 +395,10 @@ public class QBSubQuery implements ISubQ
     }
     
     public ASTNode getJoinConditionAST() {
-      return 
+      ASTNode ast = 
           SubQueryUtils.buildNotInNullJoinCond(getAlias(), CNT_ALIAS);
+      SubQueryUtils.setOriginDeep(ast, QBSubQuery.this.originalSQASTOrigin);
+      return ast;
     }
     
     public QBSubQuery getSubQuery() {
@@ -475,7 +480,8 @@ public class QBSubQuery implements ISubQ
 
   void validateAndRewriteAST(RowResolver outerQueryRR,
 		  boolean forHavingClause,
-		  String outerQueryAlias) throws SemanticException {
+		  String outerQueryAlias,
+		  Set<String> outerQryAliases) throws SemanticException {
 
     ASTNode selectClause = (ASTNode) subQueryAST.getChild(1).getChild(1);
 
@@ -483,6 +489,44 @@ public class QBSubQuery implements ISubQ
     if ( selectClause.getChild(0).getType() == HiveParser.TOK_HINTLIST ) {
       selectExprStart = 1;
     }
+    
+    /*
+     * Restriction.16.s :: Correlated Expression in Outer Query must not contain
+     * unqualified column references.
+     */
+    if ( parentQueryExpression != null && !forHavingClause ) { 
+        ASTNode u = SubQueryUtils.hasUnQualifiedColumnReferences(parentQueryExpression);
+        if ( u != null ) {
+          subQueryAST.setOrigin(originalSQASTOrigin);
+          throw new SemanticException(ErrorMsg.UNSUPPORTED_SUBQUERY_EXPRESSION.getMsg(
+              u, "Correlating expression cannot contain unqualified column references."));
+        }
+    }
+    
+    /*
+     * Restriction 17.s :: SubQuery cannot use the same table alias as one used in
+     * the Outer Query.
+     */
+    List<String> sqAliases = SubQueryUtils.getTableAliasesInSubQuery(this);
+    String sharedAlias = null;
+    for(String s : sqAliases ) {
+      if ( outerQryAliases.contains(s) ) {
+        sharedAlias = s;
+      }
+    }
+    if ( sharedAlias != null) {
+      ASTNode whereClause = SubQueryUtils.subQueryWhere(subQueryAST);
+      
+      if ( whereClause != null ) {
+        ASTNode u = SubQueryUtils.hasUnQualifiedColumnReferences(whereClause);
+        if ( u != null ) {
+          subQueryAST.setOrigin(originalSQASTOrigin);
+          throw new SemanticException(ErrorMsg.UNSUPPORTED_SUBQUERY_EXPRESSION.getMsg(
+              u, "SubQuery cannot use the table alias: " + sharedAlias + "; " +
+              		"this is also an alias in the Outer Query and SubQuery contains a unqualified column reference"));
+        }
+      }
+    }
 
     /*
      * Check.5.h :: For In and Not In the SubQuery must implicitly or
@@ -491,6 +535,7 @@ public class QBSubQuery implements ISubQ
     if ( operator.getType() != SubQueryType.EXISTS &&
         operator.getType() != SubQueryType.NOT_EXISTS &&
         selectClause.getChildCount() - selectExprStart > 1 ) {
+      subQueryAST.setOrigin(originalSQASTOrigin);
       throw new SemanticException(ErrorMsg.INVALID_SUBQUERY_EXPRESSION.getMsg(
           subQueryAST, "SubQuery can contain only 1 item in Select List."));
     }
@@ -675,11 +720,7 @@ public class QBSubQuery implements ISubQ
 		  boolean forHavingClause,
 		  String outerQueryAlias) throws SemanticException {
     ASTNode selectClause = (ASTNode) subQueryAST.getChild(1).getChild(1);
-    ASTNode whereClause = null;
-    if ( subQueryAST.getChild(1).getChildCount() > 2 &&
-        subQueryAST.getChild(1).getChild(2).getType() == HiveParser.TOK_WHERE ) {
-      whereClause = (ASTNode) subQueryAST.getChild(1).getChild(2);
-    }
+    ASTNode whereClause = SubQueryUtils.subQueryWhere(subQueryAST);
 
     if ( whereClause == null ) {
       return;

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Mon Dec 23 13:40:48 2013
@@ -19,6 +19,7 @@
 package org.apache.hadoop.hive.ql.parse;
 
 import java.io.Serializable;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -2021,7 +2022,7 @@ public class SemanticAnalyzer extends Ba
         	aliasToOpInfo.put(havingInputAlias, input);
         }
 
-        subQuery.validateAndRewriteAST(inputRR, forHavingClause, havingInputAlias);
+        subQuery.validateAndRewriteAST(inputRR, forHavingClause, havingInputAlias, aliasToOpInfo.keySet());
 
         QB qbSQ = new QB(subQuery.getOuterQueryId(), subQuery.getAlias(), true);
         Operator sqPlanTopOp = genPlanForSubQueryPredicate(qbSQ, subQuery);
@@ -5354,7 +5355,7 @@ public class SemanticAnalyzer extends Ba
       // Create the work for moving the table
       // NOTE: specify Dynamic partitions in dest_tab for WriteEntity
       if (!isNonNativeTable) {
-        ltd = new LoadTableDesc(queryTmpdir, ctx.getExternalTmpFileURI(dest_path.toUri()),
+        ltd = new LoadTableDesc(new Path(queryTmpdir), ctx.getExternalTmpFileURI(dest_path.toUri()),
             table_desc, dpCtx);
         ltd.setReplace(!qb.getParseInfo().isInsertIntoTable(dest_tab.getDbName(),
             dest_tab.getTableName()));
@@ -5438,7 +5439,7 @@ public class SemanticAnalyzer extends Ba
       lbCtx = constructListBucketingCtx(dest_part.getSkewedColNames(),
           dest_part.getSkewedColValues(), dest_part.getSkewedColValueLocationMaps(),
           dest_part.isStoredAsSubDirectories(), conf);
-      ltd = new LoadTableDesc(queryTmpdir, ctx.getExternalTmpFileURI(dest_path.toUri()),
+      ltd = new LoadTableDesc(new Path(queryTmpdir), ctx.getExternalTmpFileURI(dest_path.toUri()),
           table_desc, dest_part.getSpec());
       ltd.setReplace(!qb.getParseInfo().isInsertIntoTable(dest_tab.getDbName(),
           dest_tab.getTableName()));
@@ -5560,7 +5561,7 @@ public class SemanticAnalyzer extends Ba
       }
 
       boolean isDfsDir = (dest_type.intValue() == QBMetaData.DEST_DFS_FILE);
-      loadFileWork.add(new LoadFileDesc(tblDesc, queryTmpdir, destStr, isDfsDir, cols,
+      loadFileWork.add(new LoadFileDesc(tblDesc, new Path(queryTmpdir), destStr, isDfsDir, cols,
           colTypes));
 
       if (tblDesc == null) {

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java Mon Dec 23 13:40:48 2013
@@ -280,6 +280,32 @@ public class SubQueryUtils {
       getTableAliasesInSubQuery(right, aliases);
     }
   }
+  
+  static ASTNode hasUnQualifiedColumnReferences(ASTNode ast) {
+    int type = ast.getType();
+    if ( type == HiveParser.DOT ) {
+      return null;
+    }
+    else if ( type == HiveParser.TOK_TABLE_OR_COL ) {
+      return ast;
+    }
+    
+    for(int i=0; i < ast.getChildCount(); i++ ) {
+      ASTNode c = hasUnQualifiedColumnReferences((ASTNode) ast.getChild(i));
+      if ( c != null ) {
+        return c;
+      }
+    }
+    return null;
+  }
+  
+  static ASTNode subQueryWhere(ASTNode subQueryAST) {
+    if ( subQueryAST.getChild(1).getChildCount() > 2 &&
+        subQueryAST.getChild(1).getChild(2).getType() == HiveParser.TOK_WHERE ) {
+      return (ASTNode) subQueryAST.getChild(1).getChild(2);
+    }
+    return null;
+  }
 
   /*
    * construct the ASTNode for the SQ column that will join with the OuterQuery Expression.

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java Mon Dec 23 13:40:48 2013
@@ -48,8 +48,8 @@ public class ConditionalResolverCommonJo
     HashMap<String, Long> aliasToKnownSize;
     private Task<? extends Serializable> commonJoinTask;
 
-    private String localTmpDir;
-    private String hdfsTmpDir;
+    private Path localTmpDir;
+    private Path hdfsTmpDir;
 
     public ConditionalResolverCommonJoinCtx() {
     }
@@ -86,19 +86,19 @@ public class ConditionalResolverCommonJo
       this.pathToAliases = pathToAliases;
     }
 
-    public String getLocalTmpDir() {
+    public Path getLocalTmpDir() {
       return localTmpDir;
     }
 
-    public void setLocalTmpDir(String localTmpDir) {
+    public void setLocalTmpDir(Path localTmpDir) {
       this.localTmpDir = localTmpDir;
     }
 
-    public String getHdfsTmpDir() {
+    public Path getHdfsTmpDir() {
       return hdfsTmpDir;
     }
 
-    public void setHdfsTmpDir(String hdfsTmpDir) {
+    public void setHdfsTmpDir(Path hdfsTmpDir) {
       this.hdfsTmpDir = hdfsTmpDir;
     }
   }
@@ -155,8 +155,8 @@ public class ConditionalResolverCommonJo
   private String resolveMapJoinTask(
       HashMap<String, ArrayList<String>> pathToAliases,
       HashMap<String, Task<? extends Serializable>> aliasToTask,
-      HashMap<String, Long> aliasToKnownSize, String hdfsTmpDir,
-      String localTmpDir, HiveConf conf) {
+      HashMap<String, Long> aliasToKnownSize, Path hdfsTmpDir,
+      Path localTmpDir, HiveConf conf) {
 
     String bigTableFileAlias = null;
     long smallTablesFileSizeSum = 0;
@@ -175,7 +175,7 @@ public class ConditionalResolverCommonJo
           .entrySet()) {
         String p = oneEntry.getKey();
         // this path is intermediate data
-        if (p.startsWith(hdfsTmpDir) || p.startsWith(localTmpDir)) {
+        if (p.startsWith(hdfsTmpDir.toString()) || p.startsWith(localTmpDir.toString())) {
           ArrayList<String> aliasArray = oneEntry.getValue();
           if (aliasArray.size() <= 0) {
             continue;

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/CopyWork.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/CopyWork.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/CopyWork.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/CopyWork.java Mon Dec 23 13:40:48 2013
@@ -20,6 +20,8 @@ package org.apache.hadoop.hive.ql.plan;
 
 import java.io.Serializable;
 
+import org.apache.hadoop.fs.Path;
+
 /**
  * CopyWork.
  *
@@ -27,39 +29,39 @@ import java.io.Serializable;
 @Explain(displayName = "Copy")
 public class CopyWork implements Serializable {
   private static final long serialVersionUID = 1L;
-  private String fromPath;
-  private String toPath;
+  private Path fromPath;
+  private Path toPath;
   private boolean errorOnSrcEmpty;
 
   public CopyWork() {
   }
 
-  public CopyWork(final String fromPath, final String toPath) {
+  public CopyWork(final Path fromPath, final Path toPath) {
     this(fromPath, toPath, true);
   }
 
-  public CopyWork(final String fromPath, final String toPath, boolean errorOnSrcEmpty) {
+  public CopyWork(final Path fromPath, final Path toPath, boolean errorOnSrcEmpty) {
     this.fromPath = fromPath;
     this.toPath = toPath;
     this.setErrorOnSrcEmpty(errorOnSrcEmpty);
   }
 
   @Explain(displayName = "source")
-  public String getFromPath() {
-    return fromPath;
+  public String getFromPathAsString() {
+    return fromPath.toUri().toString();
   }
-
-  public void setFromPath(final String fromPath) {
-    this.fromPath = fromPath;
+  
+  @Explain(displayName = "destination")
+  public String getToPathAsString() {
+    return toPath.toUri().toString();
   }
 
-  @Explain(displayName = "destination")
-  public String getToPath() {
-    return toPath;
+  public Path getFromPath() {
+    return fromPath;
   }
 
-  public void setToPath(final String toPath) {
-    this.toPath = toPath;
+  public Path getToPath() {
+    return toPath;
   }
 
   public void setErrorOnSrcEmpty(boolean errorOnSrcEmpty) {
@@ -69,4 +71,5 @@ public class CopyWork implements Seriali
   public boolean isErrorOnSrcEmpty() {
     return errorOnSrcEmpty;
   }
+
 }

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadDesc.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadDesc.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadDesc.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadDesc.java Mon Dec 23 13:40:48 2013
@@ -20,28 +20,30 @@ package org.apache.hadoop.hive.ql.plan;
 
 import java.io.Serializable;
 
+import org.apache.hadoop.fs.Path;
+
 /**
  * LoadDesc.
  *
  */
 public class LoadDesc implements Serializable {
   private static final long serialVersionUID = 1L;
-  private String sourceDir;
+  private Path sourcePath;
 
   public LoadDesc() {
   }
 
-  public LoadDesc(final String sourceDir) {
-
-    this.sourceDir = sourceDir;
+  public LoadDesc(final Path sourcePath) {
+    this.sourcePath = sourcePath;
   }
 
   @Explain(displayName = "source", normalExplain = false)
   public String getSourceDir() {
-    return sourceDir;
+    return sourcePath.toString();
   }
-
-  public void setSourceDir(final String source) {
-    sourceDir = source;
+  
+  public Path getSourcePath() {
+    return sourcePath;
   }
+  
 }

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadFileDesc.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadFileDesc.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadFileDesc.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadFileDesc.java Mon Dec 23 13:40:48 2013
@@ -20,6 +20,8 @@ package org.apache.hadoop.hive.ql.plan;
 
 import java.io.Serializable;
 
+import org.apache.hadoop.fs.Path;
+
 /**
  * LoadFileDesc.
  *
@@ -36,10 +38,10 @@ public class LoadFileDesc extends LoadDe
   public LoadFileDesc() {
   }
 
-  public LoadFileDesc(final CreateTableDesc createTableDesc, final String sourceDir,
+  public LoadFileDesc(final CreateTableDesc createTableDesc, final Path sourcePath,
       final String targetDir,
       final boolean isDfsDir, final String columns, final String columnTypes) {
-    this(sourceDir, targetDir, isDfsDir, columns, columnTypes);
+    this(sourcePath, targetDir, isDfsDir, columns, columnTypes);
     if (createTableDesc != null && createTableDesc.getDatabaseName() != null
         && createTableDesc.getTableName() != null) {
       destinationCreateTable = (createTableDesc.getTableName().contains(".") ? "" : createTableDesc
@@ -48,10 +50,10 @@ public class LoadFileDesc extends LoadDe
     }
   }
 
-  public LoadFileDesc(final String sourceDir, final String targetDir,
+  public LoadFileDesc(final Path sourcePath, final String targetDir,
       final boolean isDfsDir, final String columns, final String columnTypes) {
 
-    super(sourceDir);
+    super(sourcePath);
     this.targetDir = targetDir;
     this.isDfsDir = isDfsDir;
     this.columns = columns;

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadTableDesc.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadTableDesc.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadTableDesc.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadTableDesc.java Mon Dec 23 13:40:48 2013
@@ -22,6 +22,8 @@ import java.io.Serializable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.apache.hadoop.fs.Path;
+
 /**
  * LoadTableDesc.
  *
@@ -45,32 +47,32 @@ public class LoadTableDesc extends org.a
     this.holdDDLTime = false;
   }
 
-  public LoadTableDesc(final String sourceDir, final String tmpDir,
+  public LoadTableDesc(final Path sourcePath, final String tmpDir,
       final org.apache.hadoop.hive.ql.plan.TableDesc table,
       final Map<String, String> partitionSpec, final boolean replace) {
-    super(sourceDir);
-    init(sourceDir, tmpDir, table, partitionSpec, replace);
+    super(sourcePath);
+    init(tmpDir, table, partitionSpec, replace);
   }
 
-  public LoadTableDesc(final String sourceDir, final String tmpDir,
+  public LoadTableDesc(final Path sourcePath, final String tmpDir,
       final org.apache.hadoop.hive.ql.plan.TableDesc table,
       final Map<String, String> partitionSpec) {
-    this(sourceDir, tmpDir, table, partitionSpec, true);
+    this(sourcePath, tmpDir, table, partitionSpec, true);
   }
 
-  public LoadTableDesc(final String sourceDir, final String tmpDir,
+  public LoadTableDesc(final Path sourcePath, final String tmpDir,
       final org.apache.hadoop.hive.ql.plan.TableDesc table,
       final DynamicPartitionCtx dpCtx) {
-    super(sourceDir);
+    super(sourcePath);
     this.dpCtx = dpCtx;
     if (dpCtx != null && dpCtx.getPartSpec() != null && partitionSpec == null) {
-      init(sourceDir, tmpDir, table, dpCtx.getPartSpec(), true);
+      init(tmpDir, table, dpCtx.getPartSpec(), true);
     } else {
-      init(sourceDir, tmpDir, table, new LinkedHashMap<String, String>(), true);
+      init(tmpDir, table, new LinkedHashMap<String, String>(), true);
     }
   }
 
-  private void init(final String sourceDir, final String tmpDir,
+  private void init(final String tmpDir,
       final org.apache.hadoop.hive.ql.plan.TableDesc table,
       final Map<String, String> partitionSpec, final boolean replace) {
     this.tmpDir = tmpDir;

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFSum.java Mon Dec 23 13:40:48 2013
@@ -50,7 +50,7 @@ public class GenericUDAFSum extends Abst
 
   @Override
   public GenericUDAFEvaluator getEvaluator(TypeInfo[] parameters)
-    throws SemanticException {
+      throws SemanticException {
     if (parameters.length != 1) {
       throw new UDFArgumentTypeException(parameters.length - 1,
           "Exactly one argument is expected.");
@@ -59,15 +59,15 @@ public class GenericUDAFSum extends Abst
     if (parameters[0].getCategory() != ObjectInspector.Category.PRIMITIVE) {
       throw new UDFArgumentTypeException(0,
           "Only primitive type arguments are accepted but "
-          + parameters[0].getTypeName() + " is passed.");
+              + parameters[0].getTypeName() + " is passed.");
     }
     switch (((PrimitiveTypeInfo) parameters[0]).getPrimitiveCategory()) {
     case BYTE:
     case SHORT:
     case INT:
     case LONG:
-    case TIMESTAMP:
       return new GenericUDAFSumLong();
+    case TIMESTAMP:
     case FLOAT:
     case DOUBLE:
     case STRING:
@@ -81,7 +81,7 @@ public class GenericUDAFSum extends Abst
     default:
       throw new UDFArgumentTypeException(0,
           "Only numeric or string type arguments are accepted but "
-          + parameters[0].getTypeName() + " is passed.");
+              + parameters[0].getTypeName() + " is passed.");
     }
   }
 
@@ -145,7 +145,7 @@ public class GenericUDAFSum extends Abst
           LOG.warn(getClass().getSimpleName() + " "
               + StringUtils.stringifyException(e));
           LOG
-              .warn(getClass().getSimpleName()
+          .warn(getClass().getSimpleName()
               + " ignoring similar exceptions.");
         }
       }
@@ -234,7 +234,7 @@ public class GenericUDAFSum extends Abst
           LOG.warn(getClass().getSimpleName() + " "
               + StringUtils.stringifyException(e));
           LOG
-              .warn(getClass().getSimpleName()
+          .warn(getClass().getSimpleName()
               + " ignoring similar exceptions.");
         }
       }

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q Mon Dec 23 13:40:48 2013
@@ -3,3 +3,4 @@
 
 CREATE TABLE load_file_with_space_in_the_name(name STRING, age INT);
 LOAD DATA LOCAL INPATH '../../data/files/person age.txt' INTO TABLE load_file_with_space_in_the_name;
+LOAD DATA LOCAL INPATH '../../data/files/person+age.txt' INTO TABLE load_file_with_space_in_the_name;

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q Mon Dec 23 13:40:48 2013
@@ -4,6 +4,7 @@ dfs -copyFromLocal ../../data/files hdfs
 
 CREATE TABLE load_file_with_space_in_the_name(name STRING, age INT);
 LOAD DATA INPATH 'hdfs:///tmp/test/files/person age.txt' INTO TABLE load_file_with_space_in_the_name;
+LOAD DATA INPATH 'hdfs:///tmp/test/files/person+age.txt' INTO TABLE load_file_with_space_in_the_name;
 
 dfs -rmr hdfs:///tmp/test;
 

Modified: hive/branches/tez/ql/src/test/queries/clientpositive/timestamp_3.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/timestamp_3.q?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/timestamp_3.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/timestamp_3.q Mon Dec 23 13:40:48 2013
@@ -16,4 +16,6 @@ select cast(t as float) from timestamp_3
 select cast(t as double) from timestamp_3 limit 1;
 select cast(t as string) from timestamp_3 limit 1;
 
+select t, sum(t), count(*), sum(t)/count(*), avg(t) from timestamp_3 group by t;
+
 drop table timestamp_3;

Modified: hive/branches/tez/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out Mon Dec 23 13:40:48 2013
@@ -15,3 +15,9 @@ PREHOOK: Output: default@load_file_with_
 POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/person age.txt' INTO TABLE load_file_with_space_in_the_name
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@load_file_with_space_in_the_name
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/person+age.txt' INTO TABLE load_file_with_space_in_the_name
+PREHOOK: type: LOAD
+PREHOOK: Output: default@load_file_with_space_in_the_name
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/person+age.txt' INTO TABLE load_file_with_space_in_the_name
+POSTHOOK: type: LOAD
+POSTHOOK: Output: default@load_file_with_space_in_the_name

Modified: hive/branches/tez/ql/src/test/results/clientpositive/load_hdfs_file_with_space_in_the_name.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/load_hdfs_file_with_space_in_the_name.q.out?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/load_hdfs_file_with_space_in_the_name.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/load_hdfs_file_with_space_in_the_name.q.out Mon Dec 23 13:40:48 2013
@@ -10,3 +10,9 @@ PREHOOK: Output: default@load_file_with_
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@load_file_with_space_in_the_name
 #### A masked pattern was here ####
+PREHOOK: type: LOAD
+PREHOOK: Output: default@load_file_with_space_in_the_name
+#### A masked pattern was here ####
+POSTHOOK: type: LOAD
+POSTHOOK: Output: default@load_file_with_space_in_the_name
+#### A masked pattern was here ####

Modified: hive/branches/tez/ql/src/test/results/clientpositive/timestamp_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/timestamp_3.q.out?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/timestamp_3.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/timestamp_3.q.out Mon Dec 23 13:40:48 2013
@@ -106,6 +106,16 @@ POSTHOOK: Input: default@timestamp_3
 #### A masked pattern was here ####
 POSTHOOK: Lineage: timestamp_3.t EXPRESSION []
 2011-04-29 20:46:56.4485
+PREHOOK: query: select t, sum(t), count(*), sum(t)/count(*), avg(t) from timestamp_3 group by t
+PREHOOK: type: QUERY
+PREHOOK: Input: default@timestamp_3
+#### A masked pattern was here ####
+POSTHOOK: query: select t, sum(t), count(*), sum(t)/count(*), avg(t) from timestamp_3 group by t
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@timestamp_3
+#### A masked pattern was here ####
+POSTHOOK: Lineage: timestamp_3.t EXPRESSION []
+2011-04-29 20:46:56.4485	1.3041352164485E9	1	1.3041352164485E9	1.3041352164485E9
 PREHOOK: query: drop table timestamp_3
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@timestamp_3

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/case_sensitivity.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/case_sensitivity.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/case_sensitivity.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/groupby1.q.xml Mon Dec 23 13:40:48 2013
@@ -79,9 +79,6 @@
           <void property="replace"> 
            <boolean>true</boolean> 
           </void> 
-          <void property="sourceDir"> 
-           #### A masked pattern was here #### 
-          </void> 
           <void property="table"> 
            <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
             <void property="inputFileFormatClass"> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input1.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input1.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 
@@ -862,9 +856,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -905,9 +896,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc1"/> 
                   </void> 
@@ -1351,9 +1339,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -1403,9 +1388,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc2"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 
@@ -862,9 +856,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -905,9 +896,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc1"/> 
                   </void> 
@@ -1351,9 +1339,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -1403,9 +1388,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc2"/> 
                   </void> 
@@ -1732,9 +1714,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -1759,9 +1738,6 @@
                   <void property="isDfsDir"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="targetDir"> 
                    <string>../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out</string> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml Mon Dec 23 13:40:48 2013
@@ -79,9 +79,6 @@
           <void property="replace"> 
            <boolean>true</boolean> 
           </void> 
-          <void property="sourceDir"> 
-           #### A masked pattern was here #### 
-          </void> 
           <void property="table"> 
            <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
             <void property="inputFileFormatClass"> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml Mon Dec 23 13:40:48 2013
@@ -79,9 +79,6 @@
           <void property="replace"> 
            <boolean>true</boolean> 
           </void> 
-          <void property="sourceDir"> 
-           #### A masked pattern was here #### 
-          </void> 
           <void property="table"> 
            <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
             <void property="inputFileFormatClass"> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml Mon Dec 23 13:40:48 2013
@@ -79,9 +79,6 @@
           <void property="replace"> 
            <boolean>true</boolean> 
           </void> 
-          <void property="sourceDir"> 
-           #### A masked pattern was here #### 
-          </void> 
           <void property="table"> 
            <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
             <void property="inputFileFormatClass"> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml Mon Dec 23 13:40:48 2013
@@ -83,9 +83,6 @@
               <void property="replace"> 
                <boolean>true</boolean> 
               </void> 
-              <void property="sourceDir"> 
-               #### A masked pattern was here #### 
-              </void> 
               <void property="table"> 
                <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
                 <void property="inputFileFormatClass"> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml Mon Dec 23 13:40:48 2013
@@ -79,9 +79,6 @@
           <void property="replace"> 
            <boolean>true</boolean> 
           </void> 
-          <void property="sourceDir"> 
-           #### A masked pattern was here #### 
-          </void> 
           <void property="table"> 
            <object id="TableDesc0" class="org.apache.hadoop.hive.ql.plan.TableDesc"> 
             <void property="inputFileFormatClass"> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml Mon Dec 23 13:40:48 2013
@@ -377,9 +377,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -420,9 +417,6 @@
                   <void property="replace"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="table"> 
                    <object idref="TableDesc0"/> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml Mon Dec 23 13:40:48 2013
@@ -286,9 +286,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -313,9 +310,6 @@
                   <void property="isDfsDir"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="targetDir"> 
                    <string>../build/ql/test/data/warehouse/union.out</string> 
                   </void> 

Modified: hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml?rev=1553112&r1=1553111&r2=1553112&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml Mon Dec 23 13:40:48 2013
@@ -286,9 +286,6 @@
                       <void property="isDfsDir"> 
                        <boolean>true</boolean> 
                       </void> 
-                      <void property="sourceDir"> 
-                       #### A masked pattern was here #### 
-                      </void> 
                       <void property="targetDir"> 
                        #### A masked pattern was here #### 
                       </void> 
@@ -313,9 +310,6 @@
                   <void property="isDfsDir"> 
                    <boolean>true</boolean> 
                   </void> 
-                  <void property="sourceDir"> 
-                   #### A masked pattern was here #### 
-                  </void> 
                   <void property="targetDir"> 
                    <string>../build/ql/test/data/warehouse/union.out</string> 
                   </void> 



Mime
View raw message