projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19088-s3-properties-tags'
[arvados.git]
/
sdk
/
go
/
arvados
/
fs_collection.go
diff --git
a/sdk/go/arvados/fs_collection.go
b/sdk/go/arvados/fs_collection.go
index f4dae746e2a72a1a6384857749cf7261f5465917..26012e240603d0be43a1019346c4e946e2821790 100644
(file)
--- a/
sdk/go/arvados/fs_collection.go
+++ b/
sdk/go/arvados/fs_collection.go
@@
-85,6
+85,7
@@
func (c *Collection) FileSystem(client apiClient, kc keepClient) (CollectionFile
name: ".",
mode: os.ModeDir | 0755,
modTime: modTime,
name: ".",
mode: os.ModeDir | 0755,
modTime: modTime,
+ sys: func() interface{} { return c },
},
inodes: make(map[string]inode),
},
},
inodes: make(map[string]inode),
},
@@
-1159,15
+1160,17
@@
func (dn *dirnode) MemorySize() (size int64) {
case *dirnode:
size += node.MemorySize()
case *filenode:
case *dirnode:
size += node.MemorySize()
case *filenode:
+ size += 64
for _, seg := range node.segments {
switch seg := seg.(type) {
case *memSegment:
size += int64(seg.Len())
}
for _, seg := range node.segments {
switch seg := seg.(type) {
case *memSegment:
size += int64(seg.Len())
}
+ size += 64
}
}
}
}
}
}
- return
+ return
64 + size
}
// caller must have write lock.
}
// caller must have write lock.