hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1650611 - /hive/branches/HIVE-8065/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
Date Fri, 09 Jan 2015 17:38:15 GMT
Author: brock
Date: Fri Jan  9 17:38:15 2015
New Revision: 1650611

URL: http://svn.apache.org/r1650611
Log:
HIVE-9325 - Tests cannot move files due to change on HIVE-9325 (Sergio Pena via Brock)

Modified:
    hive/branches/HIVE-8065/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java

Modified: hive/branches/HIVE-8065/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-8065/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java?rev=1650611&r1=1650610&r2=1650611&view=diff
==============================================================================
--- hive/branches/HIVE-8065/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (original)
+++ hive/branches/HIVE-8065/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java Fri Jan
 9 17:38:15 2015
@@ -2364,12 +2364,8 @@ private void constructOneLBLocationMap(F
       return false;
     }
 
-    // schema is diff, return false
-    String schemaSrcf = srcf.toUri().getScheme();
-    String schemaDestf = destf.toUri().getScheme();
-
     String fullF1 = getQualifiedPathWithoutSchemeAndAuthority(srcf, fs);
-    String fullF2 = getQualifiedPathWithoutSchemeAndAuthority(srcf, fs);
+    String fullF2 = getQualifiedPathWithoutSchemeAndAuthority(destf, fs);
 
     boolean isInTest = Boolean.valueOf(HiveConf.getBoolVar(fs.getConf(), ConfVars.HIVE_IN_TEST));
     // In the automation, the data warehouse is the local file system based.
@@ -2377,6 +2373,10 @@ private void constructOneLBLocationMap(F
       return fullF1.startsWith(fullF2);
     }
 
+    // schema is diff, return false
+    String schemaSrcf = srcf.toUri().getScheme();
+    String schemaDestf = destf.toUri().getScheme();
+
     // if the schemaDestf is null, it means the destination is not in the local file system
     if (schemaDestf == null && isSrcLocal) {
       LOG.debug("The source file is in the local while the dest not.");



Mime
View raw message