projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17119: implement review feedback.
[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 1de558a1bda4ab7c2def0c03d32998b0e18535ae..0233826a7281e9aa95f5dbb9f74e93ddb1bfd473 100644
(file)
--- a/
sdk/go/arvados/fs_collection.go
+++ b/
sdk/go/arvados/fs_collection.go
@@
-38,9
+38,6
@@
type CollectionFileSystem interface {
// Total data bytes in all files.
Size() int64
// Total data bytes in all files.
Size() int64
-
- // Memory consumed by buffered file data.
- memorySize() int64
}
type collectionFileSystem struct {
}
type collectionFileSystem struct {
@@
-232,10
+229,10
@@
func (fs *collectionFileSystem) Flush(path string, shortBlocks bool) error {
return dn.flush(context.TODO(), names, flushOpts{sync: false, shortBlocks: shortBlocks})
}
return dn.flush(context.TODO(), names, flushOpts{sync: false, shortBlocks: shortBlocks})
}
-func (fs *collectionFileSystem)
m
emorySize() int64 {
+func (fs *collectionFileSystem)
M
emorySize() int64 {
fs.fileSystem.root.Lock()
defer fs.fileSystem.root.Unlock()
fs.fileSystem.root.Lock()
defer fs.fileSystem.root.Unlock()
- return fs.fileSystem.root.(*dirnode).
m
emorySize()
+ return fs.fileSystem.root.(*dirnode).
M
emorySize()
}
func (fs *collectionFileSystem) MarshalManifest(prefix string) (string, error) {
}
func (fs *collectionFileSystem) MarshalManifest(prefix string) (string, error) {
@@
-879,14
+876,14
@@
func (dn *dirnode) flush(ctx context.Context, names []string, opts flushOpts) er
}
// caller must have write lock.
}
// caller must have write lock.
-func (dn *dirnode)
m
emorySize() (size int64) {
+func (dn *dirnode)
M
emorySize() (size int64) {
for _, name := range dn.sortedNames() {
node := dn.inodes[name]
node.Lock()
defer node.Unlock()
switch node := node.(type) {
case *dirnode:
for _, name := range dn.sortedNames() {
node := dn.inodes[name]
node.Lock()
defer node.Unlock()
switch node := node.(type) {
case *dirnode:
- size += node.
m
emorySize()
+ size += node.
M
emorySize()
case *filenode:
for _, seg := range node.segments {
switch seg := seg.(type) {
case *filenode:
for _, seg := range node.segments {
switch seg := seg.(type) {