[ARVADOS] updated: 1.3.0-1899-g086c972ba
Git user
git at public.curoverse.com
Thu Nov 21 19:24:59 UTC 2019
Summary of changes:
apps/workbench/test/controllers/projects_controller_test.rb | 2 +-
lib/controller/federation/generated.go | 12 ++----------
lib/controller/federation/list.go | 6 +-----
sdk/go/arvados/collection.go | 8 +++++---
sdk/go/arvados/container.go | 4 ++--
sdk/go/arvados/fs_collection.go | 6 ++----
sdk/go/arvados/fs_deferred.go | 6 ++----
sdk/go/arvados/specimen.go | 12 +++++++-----
services/keep-balance/collection.go | 8 ++++----
services/keep-balance/collection_test.go | 6 +++---
10 files changed, 29 insertions(+), 41 deletions(-)
via 086c972bae004544cb43d9ea15388d486d3cd1ed (commit)
from 35ed9c4e39306ddbeebdf0445149be72c1cc5284 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 086c972bae004544cb43d9ea15388d486d3cd1ed
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Nov 21 14:24:19 2019 -0500
15848: Convert timestamps from pointer to value fields.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb
index dd828952b..27d7dedc9 100644
--- a/apps/workbench/test/controllers/projects_controller_test.rb
+++ b/apps/workbench/test/controllers/projects_controller_test.rb
@@ -151,7 +151,7 @@ class ProjectsControllerTest < ActionController::TestCase
end
['', ' asc', ' desc'].each do |direction|
- test "projects#show tab partial orders correctly by #{direction}" do
+ test "projects#show tab partial orders correctly by created_at#{direction}" do
_test_tab_content_order direction
end
end
diff --git a/lib/controller/federation/generated.go b/lib/controller/federation/generated.go
index 9d5a96288..caf454e9a 100755
--- a/lib/controller/federation/generated.go
+++ b/lib/controller/federation/generated.go
@@ -45,11 +45,7 @@ func (conn *Conn) ContainerList(ctx context.Context, options arvados.ListOptions
// Apply the default/implied order, "modified_at desc"
sort.Slice(merged.Items, func(i, j int) bool {
mi, mj := merged.Items[i].ModifiedAt, merged.Items[j].ModifiedAt
- if mi == nil || mj == nil {
- return false
- } else {
- return mj.Before(*mi)
- }
+ return mj.Before(mi)
})
}
return merged, err
@@ -83,11 +79,7 @@ func (conn *Conn) SpecimenList(ctx context.Context, options arvados.ListOptions)
// Apply the default/implied order, "modified_at desc"
sort.Slice(merged.Items, func(i, j int) bool {
mi, mj := merged.Items[i].ModifiedAt, merged.Items[j].ModifiedAt
- if mi == nil || mj == nil {
- return false
- } else {
- return mj.Before(*mi)
- }
+ return mj.Before(mi)
})
}
return merged, err
diff --git a/lib/controller/federation/list.go b/lib/controller/federation/list.go
index c215a4d03..4bd32fac2 100644
--- a/lib/controller/federation/list.go
+++ b/lib/controller/federation/list.go
@@ -49,11 +49,7 @@ func (conn *Conn) CollectionList(ctx context.Context, options arvados.ListOption
// Apply the default/implied order, "modified_at desc"
sort.Slice(merged.Items, func(i, j int) bool {
mi, mj := merged.Items[i].ModifiedAt, merged.Items[j].ModifiedAt
- if mi == nil || mj == nil {
- return false
- } else {
- return mj.Before(*mi)
- }
+ return mj.Before(mi)
})
}
return merged, err
diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index 5b919bea7..e8b0f9cc9 100644
--- a/sdk/go/arvados/collection.go
+++ b/sdk/go/arvados/collection.go
@@ -22,15 +22,17 @@ type Collection struct {
ManifestText string `json:"manifest_text"`
UnsignedManifestText string `json:"unsigned_manifest_text"`
Name string `json:"name"`
- CreatedAt *time.Time `json:"created_at"`
- ModifiedAt *time.Time `json:"modified_at"`
+ CreatedAt time.Time `json:"created_at"`
+ ModifiedAt time.Time `json:"modified_at"`
+ ModifiedByClientUUID string `json:"modified_by_client_uuid"`
+ ModifiedByUserUUID string `json:"modified_by_user_uuid"`
PortableDataHash string `json:"portable_data_hash"`
ReplicationConfirmed *int `json:"replication_confirmed"`
ReplicationConfirmedAt *time.Time `json:"replication_confirmed_at"`
ReplicationDesired *int `json:"replication_desired"`
StorageClassesDesired []string `json:"storage_classes_desired"`
StorageClassesConfirmed []string `json:"storage_classes_confirmed"`
- StorageClassesConfirmedAt *time.Time `json:"storage_classes_confirmed_at"`
+ StorageClassesConfirmedAt time.Time `json:"storage_classes_confirmed_at"`
DeleteAt *time.Time `json:"delete_at"`
IsTrashed bool `json:"is_trashed"`
Properties map[string]interface{} `json:"properties"`
diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index 0a75b236e..1d3b0962f 100644
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -9,10 +9,10 @@ import "time"
// Container is an arvados#container resource.
type Container struct {
UUID string `json:"uuid"`
- CreatedAt *time.Time `json:"created_at"`
+ CreatedAt time.Time `json:"created_at"`
ModifiedByClientUUID string `json:"modified_by_client_uuid"`
ModifiedByUserUUID string `json:"modified_by_user_uuid"`
- ModifiedAt *time.Time `json:"modified_at"`
+ ModifiedAt time.Time `json:"modified_at"`
Command []string `json:"command"`
ContainerImage string `json:"container_image"`
Cwd string `json:"cwd"`
diff --git a/sdk/go/arvados/fs_collection.go b/sdk/go/arvados/fs_collection.go
index b3e6aa96e..40c890802 100644
--- a/sdk/go/arvados/fs_collection.go
+++ b/sdk/go/arvados/fs_collection.go
@@ -49,11 +49,9 @@ type collectionFileSystem struct {
// FileSystem returns a CollectionFileSystem for the collection.
func (c *Collection) FileSystem(client apiClient, kc keepClient) (CollectionFileSystem, error) {
- var modTime time.Time
- if c.ModifiedAt == nil {
+ modTime := c.ModifiedAt
+ if modTime.IsZero() {
modTime = time.Now()
- } else {
- modTime = *c.ModifiedAt
}
fs := &collectionFileSystem{
uuid: c.UUID,
diff --git a/sdk/go/arvados/fs_deferred.go b/sdk/go/arvados/fs_deferred.go
index a84f64fe7..439eaec7c 100644
--- a/sdk/go/arvados/fs_deferred.go
+++ b/sdk/go/arvados/fs_deferred.go
@@ -12,10 +12,8 @@ import (
)
func deferredCollectionFS(fs FileSystem, parent inode, coll Collection) inode {
- var modTime time.Time
- if coll.ModifiedAt != nil {
- modTime = *coll.ModifiedAt
- } else {
+ modTime := coll.ModifiedAt
+ if modTime.IsZero() {
modTime = time.Now()
}
placeholder := &treenode{
diff --git a/sdk/go/arvados/specimen.go b/sdk/go/arvados/specimen.go
index 3b3b1629f..b561fb20a 100644
--- a/sdk/go/arvados/specimen.go
+++ b/sdk/go/arvados/specimen.go
@@ -7,11 +7,13 @@ package arvados
import "time"
type Specimen struct {
- UUID string `json:"uuid"`
- OwnerUUID string `json:"owner_uuid"`
- CreatedAt *time.Time `json:"created_at"`
- ModifiedAt *time.Time `json:"modified_at"`
- Properties map[string]interface{} `json:"properties"`
+ UUID string `json:"uuid"`
+ OwnerUUID string `json:"owner_uuid"`
+ CreatedAt time.Time `json:"created_at"`
+ ModifiedAt time.Time `json:"modified_at"`
+ ModifiedByClientUUID string `json:"modified_by_client_uuid"`
+ ModifiedByUserUUID string `json:"modified_by_user_uuid"`
+ Properties map[string]interface{} `json:"properties"`
}
type SpecimenList struct {
diff --git a/services/keep-balance/collection.go b/services/keep-balance/collection.go
index 534928bc8..73d129e9c 100644
--- a/services/keep-balance/collection.go
+++ b/services/keep-balance/collection.go
@@ -80,7 +80,7 @@ func EachCollection(c *arvados.Client, pageSize int, f func(arvados.Collection)
return err
}
for _, coll := range page.Items {
- if last.ModifiedAt != nil && *last.ModifiedAt == *coll.ModifiedAt && last.UUID >= coll.UUID {
+ if last.ModifiedAt == coll.ModifiedAt && last.UUID >= coll.UUID {
continue
}
callCount++
@@ -92,9 +92,9 @@ func EachCollection(c *arvados.Client, pageSize int, f func(arvados.Collection)
}
if len(page.Items) == 0 && !gettingExactTimestamp {
break
- } else if last.ModifiedAt == nil {
+ } else if last.ModifiedAt.IsZero() {
return fmt.Errorf("BUG: Last collection on the page (%s) has no modified_at timestamp; cannot make progress", last.UUID)
- } else if len(page.Items) > 0 && *last.ModifiedAt == filterTime {
+ } else if len(page.Items) > 0 && last.ModifiedAt == filterTime {
// If we requested time>=X and never got a
// time>X then we might not have received all
// items with time==X yet. Switch to
@@ -135,7 +135,7 @@ func EachCollection(c *arvados.Client, pageSize int, f func(arvados.Collection)
// avoiding that would add overhead in the
// overwhelmingly common cases, so we don't
// bother.
- filterTime = *last.ModifiedAt
+ filterTime = last.ModifiedAt
params.Filters = []arvados.Filter{{
Attr: "modified_at",
Operator: ">=",
diff --git a/services/keep-balance/collection_test.go b/services/keep-balance/collection_test.go
index a2200e1db..e6925c4af 100644
--- a/services/keep-balance/collection_test.go
+++ b/services/keep-balance/collection_test.go
@@ -30,7 +30,7 @@ func (s *integrationSuite) TestIdenticalTimestamps(c *check.C) {
var lastMod time.Time
sawUUID := make(map[string]bool)
err := EachCollection(s.client, pageSize, func(c arvados.Collection) error {
- if c.ModifiedAt == nil {
+ if c.ModifiedAt.IsZero() {
return nil
}
if sawUUID[c.UUID] {
@@ -39,14 +39,14 @@ func (s *integrationSuite) TestIdenticalTimestamps(c *check.C) {
}
got[trial] = append(got[trial], c.UUID)
sawUUID[c.UUID] = true
- if lastMod == *c.ModifiedAt {
+ if lastMod == c.ModifiedAt {
streak++
if streak > longestStreak {
longestStreak = streak
}
} else {
streak = 0
- lastMod = *c.ModifiedAt
+ lastMod = c.ModifiedAt
}
return nil
}, nil)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list