writer pattern: similar changes to reader pattern

weed/mount/page_writer_pattern.go

@@ -1,9 +1,9 @@
 package mount
 
 type WriterPattern struct {
-	isStreaming     bool
-	lastWriteOffset int64
-	chunkSize       int64
+	isSequentialCounter int64
+	lastWriteStopOffset int64
+	chunkSize           int64
 }
 
 // For streaming write: only cache the first chunk
@@ -12,33 +12,21 @@ type WriterPattern struct {
 
 func NewWriterPattern(chunkSize int64) *WriterPattern {
 	return &WriterPattern{
-		isStreaming:     true,
-		lastWriteOffset: -1,
-		chunkSize:       chunkSize,
+		isSequentialCounter: 0,
+		lastWriteStopOffset: 0,
+		chunkSize:           chunkSize,
 	}
 }
 
 func (rp *WriterPattern) MonitorWriteAt(offset int64, size int) {
-	if rp.lastWriteOffset > offset {
-		rp.isStreaming = false
+	if rp.lastWriteStopOffset == offset {
+		rp.isSequentialCounter++
+	} else {
+		rp.isSequentialCounter--
 	}
-	if rp.lastWriteOffset == -1 {
-		if offset != 0 {
-			rp.isStreaming = false
-		}
-	}
-	rp.lastWriteOffset = offset
+	rp.lastWriteStopOffset = offset + int64(size)
 }
 
-func (rp *WriterPattern) IsStreamingMode() bool {
-	return rp.isStreaming
-}
-
-func (rp *WriterPattern) IsRandomMode() bool {
-	return !rp.isStreaming
-}
-
-func (rp *WriterPattern) Reset() {
-	rp.isStreaming = true
-	rp.lastWriteOffset = -1
+func (rp *WriterPattern) IsSequentialMode() bool {
+	return rp.isSequentialCounter >= 0
 }

weed/mount/weedfs_file_write.go

@@ -58,7 +58,7 @@ func (wfs *WFS) Write(cancel <-chan struct{}, in *fuse.WriteIn, data []byte) (wr
 	entry.Attributes.FileSize = uint64(max(offset+int64(len(data)), int64(entry.Attributes.FileSize)))
 	// glog.V(4).Infof("%v write [%d,%d) %d", fh.f.fullpath(), req.Offset, req.Offset+int64(len(req.Data)), len(req.Data))
 
-	fh.dirtyPages.AddPage(offset, data, fh.dirtyPages.writerPattern.IsStreamingMode())
+	fh.dirtyPages.AddPage(offset, data, fh.dirtyPages.writerPattern.IsSequentialMode())
 
 	written = uint32(len(data))