浏览代码

[hadoop] Simplify a little copyfile

We had a series of bug about this, making the method a slightly
simpler to read.

No removing the while true as it works now.
Romain Rigaux 10 年之前
父节点
当前提交
542167a25d
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      desktop/libs/hadoop/src/hadoop/fs/webhdfs.py

+ 2 - 2
desktop/libs/hadoop/src/hadoop/fs/webhdfs.py

@@ -560,6 +560,7 @@ class WebHdfs(Hdfs):
     while True:
     while True:
       data = self.read(src, offset, UPLOAD_CHUNK_SIZE.get())
       data = self.read(src, offset, UPLOAD_CHUNK_SIZE.get())
       cnt = len(data)
       cnt = len(data)
+
       if offset == 0:
       if offset == 0:
         if skip_header:
         if skip_header:
           n = data.index('\n')
           n = data.index('\n')
@@ -571,8 +572,7 @@ class WebHdfs(Hdfs):
                     replication=sb.replication,
                     replication=sb.replication,
                     permission=oct(stat.S_IMODE(sb.mode)),
                     permission=oct(stat.S_IMODE(sb.mode)),
                     data=data)
                     data=data)
-
-      if offset != 0:
+      else:
         self.append(dst, data)
         self.append(dst, data)
 
 
       if cnt < UPLOAD_CHUNK_SIZE.get():
       if cnt < UPLOAD_CHUNK_SIZE.get():