Merge pull request #12 from chrislusf/master

sync

12 files changed, 242 insertions, 25 deletions

diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml
index 6727f749f..c8e90c96a 100644
--- a/other/java/client/pom.xml
+++ b/other/java/client/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.chrislusf</groupId>
     <artifactId>seaweedfs-client</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.6</version>
 
     <parent>
         <groupId>org.sonatype.oss</groupId>
diff --git a/other/java/client/pom.xml.deploy b/other/java/client/pom.xml.deploy
index 6727f749f..c8e90c96a 100644
--- a/other/java/client/pom.xml.deploy
+++ b/other/java/client/pom.xml.deploy
@@ -5,7 +5,7 @@
 
     <groupId>com.github.chrislusf</groupId>
     <artifactId>seaweedfs-client</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.6</version>
 
     <parent>
         <groupId>org.sonatype.oss</groupId>
diff --git a/other/java/client/pom_debug.xml b/other/java/client/pom_debug.xml
index ed3f07298..395efa984 100644
--- a/other/java/client/pom_debug.xml
+++ b/other/java/client/pom_debug.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.chrislusf</groupId>
     <artifactId>seaweedfs-client</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.6</version>
 
     <parent>
         <groupId>org.sonatype.oss</groupId>
diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
index cd2f55678..045751717 100644
--- a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
+++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
@@ -23,7 +23,7 @@ public class SeaweedRead {
     // returns bytesRead
     public static long read(FilerGrpcClient filerGrpcClient, List<VisibleInterval> visibleIntervals,
                             final long position, final byte[] buffer, final int bufferOffset,
-                            final int bufferLength) throws IOException {
+                            final int bufferLength, final long fileSize) throws IOException {
 
         List<ChunkView> chunkViews = viewFromVisibles(visibleIntervals, position, bufferLength);
 
@@ -42,6 +42,14 @@ public class SeaweedRead {
         long readCount = 0;
         int startOffset = bufferOffset;
         for (ChunkView chunkView : chunkViews) {
+
+            if (startOffset < chunkView.logicOffset) {
+                long gap = chunkView.logicOffset - startOffset;
+                LOG.debug("zero [{},{})", startOffset, startOffset + gap);
+                readCount += gap;
+                startOffset += gap;
+            }
+
             FilerProto.Locations locations = vid2Locations.get(parseVolumeId(chunkView.fileId));
             if (locations == null || locations.getLocationsCount() == 0) {
                 LOG.error("failed to locate {}", chunkView.fileId);
@@ -51,11 +59,22 @@ public class SeaweedRead {
 
             int len = readChunkView(position, buffer, startOffset, chunkView, locations);
 
+            LOG.debug("read [{},{}) {} size {}", startOffset, startOffset + len, chunkView.fileId, chunkView.size);
+
             readCount += len;
             startOffset += len;
 
         }
 
+        long limit = Math.min(bufferLength, fileSize);
+
+        if (startOffset < limit) {
+            long gap = limit - startOffset;
+            LOG.debug("zero2 [{},{})", startOffset, startOffset + gap);
+            readCount += gap;
+            startOffset += gap;
+        }
+
         return readCount;
     }
 
@@ -71,7 +90,7 @@ public class SeaweedRead {
         int len = (int) chunkView.size;
         LOG.debug("readChunkView fid:{} chunkData.length:{} chunkView.offset:{} buffer.length:{} startOffset:{} len:{}",
                 chunkView.fileId, chunkData.length, chunkView.offset, buffer.length, startOffset, len);
-        System.arraycopy(chunkData, (int) chunkView.offset, buffer, startOffset, len);
+        System.arraycopy(chunkData, startOffset - (int) (chunkView.logicOffset - chunkView.offset), buffer, startOffset, len);
 
         return len;
     }
@@ -93,7 +112,7 @@ public class SeaweedRead {
             Header contentEncodingHeader = entity.getContentEncoding();
 
             if (contentEncodingHeader != null) {
-                HeaderElement[] encodings =contentEncodingHeader.getElements();
+                HeaderElement[] encodings = contentEncodingHeader.getElements();
                 for (int i = 0; i < encodings.length; i++) {
                     if (encodings[i].getName().equalsIgnoreCase("gzip")) {
                         entity = new GzipDecompressingEntity(entity);
@@ -134,18 +153,19 @@ public class SeaweedRead {
 
         long stop = offset + size;
         for (VisibleInterval chunk : visibleIntervals) {
-            if (chunk.start <= offset && offset < chunk.stop && offset < stop) {
+            long chunkStart = Math.max(offset, chunk.start);
+            long chunkStop = Math.min(stop, chunk.stop);
+            if (chunkStart < chunkStop) {
                 boolean isFullChunk = chunk.isFullChunk && chunk.start == offset && chunk.stop <= stop;
                 views.add(new ChunkView(
                         chunk.fileId,
-                        offset - chunk.start,
-                        Math.min(chunk.stop, stop) - offset,
-                        offset,
+                        chunkStart - chunk.start + chunk.chunkOffset,
+                        chunkStop - chunkStart,
+                        chunkStart,
                         isFullChunk,
                         chunk.cipherKey,
                         chunk.isCompressed
                 ));
-                offset = Math.min(chunk.stop, stop);
             }
         }
         return views;
@@ -160,7 +180,13 @@ public class SeaweedRead {
         Arrays.sort(chunks, new Comparator<FilerProto.FileChunk>() {
             @Override
             public int compare(FilerProto.FileChunk a, FilerProto.FileChunk b) {
-                return (int) (a.getMtime() - b.getMtime());
+                // if just a.getMtime() - b.getMtime(), it will overflow!
+                if (a.getMtime() < b.getMtime()) {
+                    return -1;
+                } else if (a.getMtime() > b.getMtime()) {
+                    return 1;
+                }
+                return 0;
             }
         });
 
@@ -181,6 +207,7 @@ public class SeaweedRead {
                 chunk.getOffset() + chunk.getSize(),
                 chunk.getFileId(),
                 chunk.getMtime(),
+                0,
                 true,
                 chunk.getCipherKey().toByteArray(),
                 chunk.getIsCompressed()
@@ -203,6 +230,7 @@ public class SeaweedRead {
                         chunk.getOffset(),
                         v.fileId,
                         v.modifiedTime,
+                        v.chunkOffset,
                         false,
                         v.cipherKey,
                         v.isCompressed
@@ -215,6 +243,7 @@ public class SeaweedRead {
                         v.stop,
                         v.fileId,
                         v.modifiedTime,
+                        v.chunkOffset + (chunkStop - v.start),
                         false,
                         v.cipherKey,
                         v.isCompressed
@@ -247,6 +276,10 @@ public class SeaweedRead {
         return fileId;
     }
 
+    public static long fileSize(FilerProto.Entry entry) {
+        return Math.max(totalSize(entry.getChunksList()), entry.getAttributes().getFileSize());
+    }
+
     public static long totalSize(List<FilerProto.FileChunk> chunksList) {
         long size = 0;
         for (FilerProto.FileChunk chunk : chunksList) {
@@ -263,15 +296,17 @@ public class SeaweedRead {
         public final long stop;
         public final long modifiedTime;
         public final String fileId;
+        public final long chunkOffset;
         public final boolean isFullChunk;
         public final byte[] cipherKey;
         public final boolean isCompressed;
 
-        public VisibleInterval(long start, long stop, String fileId, long modifiedTime, boolean isFullChunk, byte[] cipherKey, boolean isCompressed) {
+        public VisibleInterval(long start, long stop, String fileId, long modifiedTime, long chunkOffset, boolean isFullChunk, byte[] cipherKey, boolean isCompressed) {
             this.start = start;
             this.stop = stop;
             this.modifiedTime = modifiedTime;
             this.fileId = fileId;
+            this.chunkOffset = chunkOffset;
             this.isFullChunk = isFullChunk;
             this.cipherKey = cipherKey;
             this.isCompressed = isCompressed;
diff --git a/other/java/hdfs2/dependency-reduced-pom.xml b/other/java/hdfs2/dependency-reduced-pom.xml
index c54f8d2a7..1f48d8390 100644
--- a/other/java/hdfs2/dependency-reduced-pom.xml
+++ b/other/java/hdfs2/dependency-reduced-pom.xml
@@ -301,7 +301,7 @@
     </snapshotRepository>

   </distributionManagement>

   <properties>

-    <seaweedfs.client.version>1.4.5</seaweedfs.client.version>

+    <seaweedfs.client.version>1.4.6</seaweedfs.client.version>

     <hadoop.version>2.9.2</hadoop.version>

   </properties>

 </project>

diff --git a/other/java/hdfs2/pom.xml b/other/java/hdfs2/pom.xml
index 2c8d4ce32..a8de5bca0 100644
--- a/other/java/hdfs2/pom.xml
+++ b/other/java/hdfs2/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <seaweedfs.client.version>1.4.5</seaweedfs.client.version>
+        <seaweedfs.client.version>1.4.6</seaweedfs.client.version>
         <hadoop.version>2.9.2</hadoop.version>
     </properties>
 
diff --git a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java
index 0db6a1f49..53185367a 100644
--- a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java
+++ b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java
@@ -124,7 +124,7 @@ public class SeaweedFileSystemStore {
 
     private FileStatus doGetFileStatus(Path path, FilerProto.Entry entry) {
         FilerProto.FuseAttributes attributes = entry.getAttributes();
-        long length = SeaweedRead.totalSize(entry.getChunksList());
+        long length = SeaweedRead.fileSize(entry);
         boolean isDir = entry.getIsDirectory();
         int block_replication = 1;
         int blocksize = 512;
@@ -185,7 +185,7 @@ public class SeaweedFileSystemStore {
                 entry.mergeFrom(existingEntry);
                 entry.getAttributesBuilder().setMtime(now);
                 LOG.debug("createFile merged entry path:{} entry:{} from:{}", path, entry, existingEntry);
-                writePosition = SeaweedRead.totalSize(existingEntry.getChunksList());
+                writePosition = SeaweedRead.fileSize(existingEntry);
                 replication = existingEntry.getAttributes().getReplication();
             }
         }
diff --git a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedInputStream.java b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedInputStream.java
index 6b3c72f7d..36c0766a4 100644
--- a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedInputStream.java
+++ b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedInputStream.java
@@ -41,7 +41,7 @@ public class SeaweedInputStream extends FSInputStream {
         this.statistics = statistics;
         this.path = path;
         this.entry = entry;
-        this.contentLength = SeaweedRead.totalSize(entry.getChunksList());
+        this.contentLength = SeaweedRead.fileSize(entry);
         this.bufferSize = bufferSize;
 
         this.visibleIntervalList = SeaweedRead.nonOverlappingVisibleIntervals(filerGrpcClient, entry.getChunksList());
@@ -87,7 +87,7 @@ public class SeaweedInputStream extends FSInputStream {
             throw new IllegalArgumentException("requested read length is more than will fit after requested offset in buffer");
         }
 
-        long bytesRead = SeaweedRead.read(this.filerGrpcClient, this.visibleIntervalList, this.position, b, off, len);
+        long bytesRead = SeaweedRead.read(this.filerGrpcClient, this.visibleIntervalList, this.position, b, off, len, SeaweedRead.fileSize(entry));
         if (bytesRead > Integer.MAX_VALUE) {
             throw new IOException("Unexpected Content-Length");
         }
diff --git a/other/java/hdfs3/dependency-reduced-pom.xml b/other/java/hdfs3/dependency-reduced-pom.xml
index 5f1e278f8..25de9dfc0 100644
--- a/other/java/hdfs3/dependency-reduced-pom.xml
+++ b/other/java/hdfs3/dependency-reduced-pom.xml
@@ -120,6 +120,188 @@
       </plugin>

     </plugins>

   </build>

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.hadoop</groupId>

+      <artifactId>hadoop-client</artifactId>

+      <version>3.1.1</version>

+      <scope>provided</scope>

+      <exclusions>

+        <exclusion>

+          <artifactId>hadoop-hdfs-client</artifactId>

+          <groupId>org.apache.hadoop</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>hadoop-yarn-api</artifactId>

+          <groupId>org.apache.hadoop</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>hadoop-yarn-client</artifactId>

+          <groupId>org.apache.hadoop</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>hadoop-mapreduce-client-core</artifactId>

+          <groupId>org.apache.hadoop</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>

+          <groupId>org.apache.hadoop</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>hadoop-annotations</artifactId>

+          <groupId>org.apache.hadoop</groupId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.hadoop</groupId>

+      <artifactId>hadoop-common</artifactId>

+      <version>3.1.1</version>

+      <scope>provided</scope>

+      <exclusions>

+        <exclusion>

+          <artifactId>commons-cli</artifactId>

+          <groupId>commons-cli</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>commons-math3</artifactId>

+          <groupId>org.apache.commons</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>commons-io</artifactId>

+          <groupId>commons-io</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>commons-net</artifactId>

+          <groupId>commons-net</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>commons-collections</artifactId>

+          <groupId>commons-collections</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>javax.servlet-api</artifactId>

+          <groupId>javax.servlet</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jetty-server</artifactId>

+          <groupId>org.eclipse.jetty</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jetty-util</artifactId>

+          <groupId>org.eclipse.jetty</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jetty-servlet</artifactId>

+          <groupId>org.eclipse.jetty</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jetty-webapp</artifactId>

+          <groupId>org.eclipse.jetty</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jsp-api</artifactId>

+          <groupId>javax.servlet.jsp</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jersey-core</artifactId>

+          <groupId>com.sun.jersey</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jersey-servlet</artifactId>

+          <groupId>com.sun.jersey</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jersey-json</artifactId>

+          <groupId>com.sun.jersey</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jersey-server</artifactId>

+          <groupId>com.sun.jersey</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>log4j</artifactId>

+          <groupId>log4j</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>commons-lang</artifactId>

+          <groupId>commons-lang</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>commons-beanutils</artifactId>

+          <groupId>commons-beanutils</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>commons-configuration2</artifactId>

+          <groupId>org.apache.commons</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>commons-lang3</artifactId>

+          <groupId>org.apache.commons</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>slf4j-log4j12</artifactId>

+          <groupId>org.slf4j</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>avro</artifactId>

+          <groupId>org.apache.avro</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>re2j</artifactId>

+          <groupId>com.google.re2j</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>hadoop-auth</artifactId>

+          <groupId>org.apache.hadoop</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jsch</artifactId>

+          <groupId>com.jcraft</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>curator-client</artifactId>

+          <groupId>org.apache.curator</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>curator-recipes</artifactId>

+          <groupId>org.apache.curator</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>htrace-core4</artifactId>

+          <groupId>org.apache.htrace</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>zookeeper</artifactId>

+          <groupId>org.apache.zookeeper</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>commons-compress</artifactId>

+          <groupId>org.apache.commons</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>kerb-simplekdc</artifactId>

+          <groupId>org.apache.kerby</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>jackson-databind</artifactId>

+          <groupId>com.fasterxml.jackson.core</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>stax2-api</artifactId>

+          <groupId>org.codehaus.woodstox</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>woodstox-core</artifactId>

+          <groupId>com.fasterxml.woodstox</groupId>

+        </exclusion>

+        <exclusion>

+          <artifactId>hadoop-annotations</artifactId>

+          <groupId>org.apache.hadoop</groupId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+  </dependencies>

   <distributionManagement>

     <snapshotRepository>

       <id>ossrh</id>

@@ -127,7 +309,7 @@
     </snapshotRepository>

   </distributionManagement>

   <properties>

-    <seaweedfs.client.version>1.4.5</seaweedfs.client.version>

+    <seaweedfs.client.version>1.4.6</seaweedfs.client.version>

     <hadoop.version>3.1.1</hadoop.version>

   </properties>

 </project>

diff --git a/other/java/hdfs3/pom.xml b/other/java/hdfs3/pom.xml
index b1bd27f74..afb6ef309 100644
--- a/other/java/hdfs3/pom.xml
+++ b/other/java/hdfs3/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <seaweedfs.client.version>1.4.5</seaweedfs.client.version>
+        <seaweedfs.client.version>1.4.6</seaweedfs.client.version>
         <hadoop.version>3.1.1</hadoop.version>
     </properties>
 
diff --git a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java
index 0db6a1f49..53185367a 100644
--- a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java
+++ b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java
@@ -124,7 +124,7 @@ public class SeaweedFileSystemStore {
 
     private FileStatus doGetFileStatus(Path path, FilerProto.Entry entry) {
         FilerProto.FuseAttributes attributes = entry.getAttributes();
-        long length = SeaweedRead.totalSize(entry.getChunksList());
+        long length = SeaweedRead.fileSize(entry);
         boolean isDir = entry.getIsDirectory();
         int block_replication = 1;
         int blocksize = 512;
@@ -185,7 +185,7 @@ public class SeaweedFileSystemStore {
                 entry.mergeFrom(existingEntry);
                 entry.getAttributesBuilder().setMtime(now);
                 LOG.debug("createFile merged entry path:{} entry:{} from:{}", path, entry, existingEntry);
-                writePosition = SeaweedRead.totalSize(existingEntry.getChunksList());
+                writePosition = SeaweedRead.fileSize(existingEntry);
                 replication = existingEntry.getAttributes().getReplication();
             }
         }
diff --git a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedInputStream.java b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedInputStream.java
index 6b3c72f7d..36c0766a4 100644
--- a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedInputStream.java
+++ b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedInputStream.java
@@ -41,7 +41,7 @@ public class SeaweedInputStream extends FSInputStream {
         this.statistics = statistics;
         this.path = path;
         this.entry = entry;
-        this.contentLength = SeaweedRead.totalSize(entry.getChunksList());
+        this.contentLength = SeaweedRead.fileSize(entry);
         this.bufferSize = bufferSize;
 
         this.visibleIntervalList = SeaweedRead.nonOverlappingVisibleIntervals(filerGrpcClient, entry.getChunksList());
@@ -87,7 +87,7 @@ public class SeaweedInputStream extends FSInputStream {
             throw new IllegalArgumentException("requested read length is more than will fit after requested offset in buffer");
         }
 
-        long bytesRead = SeaweedRead.read(this.filerGrpcClient, this.visibleIntervalList, this.position, b, off, len);
+        long bytesRead = SeaweedRead.read(this.filerGrpcClient, this.visibleIntervalList, this.position, b, off, len, SeaweedRead.fileSize(entry));
         if (bytesRead > Integer.MAX_VALUE) {
             throw new IOException("Unexpected Content-Length");
         }