aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnextday <fw2k4@163.com>2015-12-01 20:53:44 +0800
committertnextday <fw2k4@163.com>2015-12-01 20:53:44 +0800
commitde5e07ce3ec9e8b7d56fcb10b287884a8f4dbcb5 (patch)
tree1c7146b993ff7cb56fd3d9bd4ffc87279a0b0a11
parent6b0894d80635047479548bb19029300a596b4d55 (diff)
downloadseaweedfs-de5e07ce3ec9e8b7d56fcb10b287884a8f4dbcb5.tar.xz
seaweedfs-de5e07ce3ec9e8b7d56fcb10b287884a8f4dbcb5.zip
rename FlagChunkedFile to FlagChunkManifest
-rw-r--r--go/storage/needle.go2
-rw-r--r--go/storage/needle_read_write.go10
-rw-r--r--go/weed/weed_server/volume_server_handlers_read.go2
3 files changed, 7 insertions, 7 deletions
diff --git a/go/storage/needle.go b/go/storage/needle.go
index c09ad061a..c45951feb 100644
--- a/go/storage/needle.go
+++ b/go/storage/needle.go
@@ -162,7 +162,7 @@ func NewNeedle(r *http.Request, fixJpgOrientation bool) (n *Needle, e error) {
}
if isChunkedFile {
- n.SetChunkedFile()
+ n.SetChunkManifest()
}
if fixJpgOrientation {
diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go
index 28b0e8fde..9d7af600a 100644
--- a/go/storage/needle_read_write.go
+++ b/go/storage/needle_read_write.go
@@ -16,7 +16,7 @@ const (
FlagHasMime = 0x04
FlagHasLastModifiedDate = 0x08
FlagHasTtl = 0x10
- FlagChunkedFile = 0x80
+ FlagChunkManifest = 0x80
LastModifiedBytesLength = 5
TtlBytesLength = 2
)
@@ -282,10 +282,10 @@ func (n *Needle) SetHasTtl() {
n.Flags = n.Flags | FlagHasTtl
}
-func (n *Needle) IsChunkedFile() bool {
- return n.Flags&FlagChunkedFile > 0
+func (n *Needle) IsChunkedManifest() bool {
+ return n.Flags&FlagChunkManifest > 0
}
-func (n *Needle) SetChunkedFile() {
- n.Flags = n.Flags | FlagChunkedFile
+func (n *Needle) SetChunkManifest() {
+ n.Flags = n.Flags | FlagChunkManifest
}
diff --git a/go/weed/weed_server/volume_server_handlers_read.go b/go/weed/weed_server/volume_server_handlers_read.go
index febed354b..36c655bd5 100644
--- a/go/weed/weed_server/volume_server_handlers_read.go
+++ b/go/weed/weed_server/volume_server_handlers_read.go
@@ -222,7 +222,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
}
func (vs *VolumeServer) tryHandleChunkedFile(n *storage.Needle, fileName string, w http.ResponseWriter, r *http.Request) (processed bool) {
- if !n.IsChunkedFile() {
+ if !n.IsChunkedManifest() {
return false
}
processed = true