X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7d1970e46ed5dab65e1eaa28b3ddfe609ffe6e4e..64c516079154f73da3f2a33a957fa8ae8eb23749:/sdk/go/arvados/collection.go

diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index 94390bc019..cec20279d1 100644
--- a/sdk/go/arvados/collection.go
+++ b/sdk/go/arvados/collection.go
@@ -6,7 +6,9 @@ package arvados
 
 import (
 	"bufio"
+	"crypto/md5"
 	"fmt"
+	"regexp"
 	"strings"
 	"time"
 
@@ -32,18 +34,17 @@ type Collection struct {
 	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"`
 	WritableBy                []string               `json:"writable_by,omitempty"`
-	FileCount                 *int                   `json:"file_count"`
-	FileSizeTotal             *int                   `json:"file_size_total"`
-	Version                   *int                   `json:"version"`
+	FileCount                 int                    `json:"file_count"`
+	FileSizeTotal             int64                  `json:"file_size_total"`
+	Version                   int                    `json:"version"`
 	PreserveVersion           bool                   `json:"preserve_version"`
 	CurrentVersionUUID        string                 `json:"current_version_uuid"`
 	Description               string                 `json:"description"`
-	Href                      string                 `json:"href"`
 }
 
 func (c Collection) resourceName() string {
@@ -52,6 +53,8 @@ func (c Collection) resourceName() string {
 
 // SizedDigests returns the hash+size part of each data block
 // referenced by the collection.
+//
+// Zero-length blocks are not included.
 func (c *Collection) SizedDigests() ([]SizedDigest, error) {
 	manifestText := c.ManifestText
 	if manifestText == "" {
@@ -75,6 +78,10 @@ func (c *Collection) SizedDigests() ([]SizedDigest, error) {
 				// FIXME: ensure it's a file token
 				break
 			}
+			if strings.HasPrefix(token, "d41d8cd98f00b204e9800998ecf8427e+0") {
+				// Exclude "empty block" placeholder
+				continue
+			}
 			// FIXME: shouldn't assume 32 char hash
 			if i := strings.IndexRune(token[33:], '+'); i >= 0 {
 				token = token[:33+i]
@@ -91,3 +98,28 @@ type CollectionList struct {
 	Offset         int          `json:"offset"`
 	Limit          int          `json:"limit"`
 }
+
+var (
+	blkRe = regexp.MustCompile(`^ [0-9a-f]{32}\+\d+`)
+	tokRe = regexp.MustCompile(` ?[^ ]*`)
+)
+
+// PortableDataHash computes the portable data hash of the given
+// manifest.
+func PortableDataHash(mt string) string {
+	h := md5.New()
+	size := 0
+	_ = tokRe.ReplaceAllFunc([]byte(mt), func(tok []byte) []byte {
+		if m := blkRe.Find(tok); m != nil {
+			// write hash+size, ignore remaining block hints
+			tok = m
+		}
+		n, err := h.Write(tok)
+		if err != nil {
+			panic(err)
+		}
+		size += n
+		return nil
+	})
+	return fmt.Sprintf("%x+%d", h.Sum(nil), size)
+}