hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject hive git commit: HIVE-14301 : insert overwrite fails for nonpartitioned tables in s3 (Rajesh Balamohan via Ashutosh Chauhan)
Date Thu, 21 Jul 2016 15:11:58 GMT
Repository: hive
Updated Branches:
  refs/heads/branch-2.1 19b7879f4 -> 21466bb3f


HIVE-14301 : insert overwrite fails for nonpartitioned tables in s3 (Rajesh Balamohan via
Ashutosh Chauhan)

Signed-off-by: Ashutosh Chauhan <hashutosh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/21466bb3
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/21466bb3
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/21466bb3

Branch: refs/heads/branch-2.1
Commit: 21466bb3f3c684601b32f62756d7231a58fd7423
Parents: 19b7879
Author: Rajesh Balamohan <rbalamohan at apache dot org>
Authored: Thu Jul 21 08:01:33 2016 -0700
Committer: Ashutosh Chauhan <hashutosh@apache.org>
Committed: Thu Jul 21 08:06:59 2016 -0700

----------------------------------------------------------------------
 common/src/java/org/apache/hadoop/hive/conf/HiveConf.java |  2 +-
 ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/21466bb3/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 68f3e33..84e93aa 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -2464,7 +2464,7 @@ public class HiveConf extends Configuration {
     HIVE_SECURITY_COMMAND_WHITELIST("hive.security.command.whitelist", "set,reset,dfs,add,list,delete,reload,compile",
         "Comma separated list of non-SQL Hive commands users are authorized to execute"),
 
-    HIVE_MOVE_FILES_THREAD_COUNT("hive.mv.files.thread", 25, new  SizeValidator(0L, true,
1024L, true), "Number of threads"
+    HIVE_MOVE_FILES_THREAD_COUNT("hive.mv.files.thread", 15, new  SizeValidator(0L, true,
1024L, true), "Number of threads"
          + " used to move files in move task. Set it to 0 to disable multi-threaded file
moves. This parameter is also used by"
          + " MSCK to check tables."),
     // If this is set all move tasks at the end of a multi-insert query will only begin once
all

http://git-wip-us.apache.org/repos/asf/hive/blob/21466bb3/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
index 611266f..d5c6c72 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
@@ -2929,8 +2929,9 @@ private void constructOneLBLocationMap(FileStatus fSta,
             /* Move files one by one because source is a subdirectory of destination */
             for (final FileStatus srcStatus : srcs) {
 
+              final Path destFile = new Path(destf, srcStatus.getPath().getName());
               if (null == pool) {
-                if(!destFs.rename(srcStatus.getPath(), destf)) {
+                if(!destFs.rename(srcStatus.getPath(), destFile)) {
                   throw new IOException("rename for src path: " + srcStatus.getPath() + "
to dest:"
                       + destf + " returned false");
                 }
@@ -2939,15 +2940,14 @@ private void constructOneLBLocationMap(FileStatus fSta,
                   @Override
                   public Void call() throws Exception {
                     SessionState.setCurrentSessionState(parentSession);
-                    final Path destPath = new Path(destf, srcStatus.getPath().getName());
                     final String group = srcStatus.getGroup();
-                    if(destFs.rename(srcStatus.getPath(), destf)) {
+                    if(destFs.rename(srcStatus.getPath(), destFile)) {
                       if (inheritPerms) {
-                        HdfsUtils.setFullFileStatus(conf, desiredStatus, group, destFs, destPath,
false);
+                        HdfsUtils.setFullFileStatus(conf, desiredStatus, group, destFs, destFile,
false);
                       }
                     } else {
                       throw new IOException("rename for src path: " + srcStatus.getPath()
+ " to dest path:"
-                          + destPath + " returned false");
+                          + destFile + " returned false");
                     }
                     return null;
                   }


Mime
View raw message