aboutsummaryrefslogtreecommitdiff
path: root/weed/storage/file_id.go
diff options
context:
space:
mode:
authorChris Lu <chrislusf@users.noreply.github.com>2018-07-21 20:14:38 -0700
committerGitHub <noreply@github.com>2018-07-21 20:14:38 -0700
commit3423c1da18487e4dc3d77a024f9c0d5d3b7599cf (patch)
treecc72caa73fadbdb81659c1f13bb87f33c502fbc1 /weed/storage/file_id.go
parentc98df05ed0fc78e8585c6dd7d2ae317c7c42d9c3 (diff)
parent49375d603177e4134d0cb4128324a2dd70521290 (diff)
downloadseaweedfs-3423c1da18487e4dc3d77a024f9c0d5d3b7599cf.tar.xz
seaweedfs-3423c1da18487e4dc3d77a024f9c0d5d3b7599cf.zip
Merge pull request #693 from chrislusf/add_s3
Add "weed s3" to support S3 API
Diffstat (limited to 'weed/storage/file_id.go')
-rw-r--r--weed/storage/file_id.go10
1 files changed, 7 insertions, 3 deletions
diff --git a/weed/storage/file_id.go b/weed/storage/file_id.go
index 0871bfb25..37dcb7c70 100644
--- a/weed/storage/file_id.go
+++ b/weed/storage/file_id.go
@@ -20,11 +20,15 @@ func NewFileId(VolumeId VolumeId, key uint64, cookie uint32) *FileId {
}
func (n *FileId) String() string {
+ return n.VolumeId.String() + "," + formatNeedleIdCookie(n.Key, n.Cookie)
+}
+
+func formatNeedleIdCookie(key NeedleId, cookie Cookie) string {
bytes := make([]byte, NeedleIdSize+CookieSize)
- NeedleIdToBytes(bytes[0:NeedleIdSize], n.Key)
- CookieToBytes(bytes[NeedleIdSize:NeedleIdSize+CookieSize], n.Cookie)
+ NeedleIdToBytes(bytes[0:NeedleIdSize], key)
+ CookieToBytes(bytes[NeedleIdSize:NeedleIdSize+CookieSize], cookie)
nonzero_index := 0
for ; bytes[nonzero_index] == 0; nonzero_index++ {
}
- return n.VolumeId.String() + "," + hex.EncodeToString(bytes[nonzero_index:])
+ return hex.EncodeToString(bytes[nonzero_index:])
}