projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14594-update-cwltool' refs #14594
[arvados.git]
/
sdk
/
go
/
blockdigest
/
blockdigest.go
diff --git
a/sdk/go/blockdigest/blockdigest.go
b/sdk/go/blockdigest/blockdigest.go
index d2f1c60ba93889614de18756dcf3ed6608f0b5fa..b9ecc45abc6a29d6d92642f41efcd26689457d52 100644
(file)
--- a/
sdk/go/blockdigest/blockdigest.go
+++ b/
sdk/go/blockdigest/blockdigest.go
@@
-1,16
+1,19
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
// Stores a Block Locator Digest compactly. Can be used as a map key.
package blockdigest
import (
"fmt"
// Stores a Block Locator Digest compactly. Can be used as a map key.
package blockdigest
import (
"fmt"
- "log"
"regexp"
"strconv"
"strings"
)
var LocatorPattern = regexp.MustCompile(
"regexp"
"strconv"
"strings"
)
var LocatorPattern = regexp.MustCompile(
- "^[0-9a-fA-F]{32}\\+[0-9]+(\\+[A-Z][A-Za-z0-9@_-]
+
)*$")
+ "^[0-9a-fA-F]{32}\\+[0-9]+(\\+[A-Z][A-Za-z0-9@_-]
*
)*$")
// Stores a Block Locator Digest compactly, up to 128 bits.
// Can be used as a map key.
// Stores a Block Locator Digest compactly, up to 128 bits.
// Can be used as a map key.
@@
-58,15
+61,6
@@
func FromString(s string) (dig BlockDigest, err error) {
return
}
return
}
-// Will fatal with the error if an error is encountered
-func AssertFromString(s string) BlockDigest {
- d, err := FromString(s)
- if err != nil {
- log.Fatalf("Error creating BlockDigest from %s: %v", s, err)
- }
- return d
-}
-
func IsBlockLocator(s string) bool {
return LocatorPattern.MatchString(s)
}
func IsBlockLocator(s string) bool {
return LocatorPattern.MatchString(s)
}