Include tile variant IDs in library.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --git a/gob.go b/gob.go
index 716f2b8c25b5b28edc4ee306cf3d86f43c7768cc..7619ebd44f2b6b5fb351b59e534809de6056b040 100644 (file)
--- a/gob.go
+++ b/gob.go
@@ -16,6 +16,7 @@ type CompactGenome struct {
 
 type TileVariant struct {
        Tag      tagID
+       Variant  tileVariantID
        Blake2b  [blake2b.Size256]byte
        Sequence []byte
 }

diff --git a/tilelib.go b/tilelib.go
index 47de7b048f3ecb465a38ac9d8facbc94cf9bef1d..857b56683095dc9ddd1c7169fa3b2b1487c0edda 100644 (file)
--- a/tilelib.go
+++ b/tilelib.go
@@ -175,13 +175,15 @@ func (tilelib *tileLibrary) getRef(tag tagID, seq []byte) tileLibRef {
        tilelib.variants++
        tilelib.variant[tag] = append(tilelib.variant[tag], seqhash)
        // tilelib.seq[seqhash] = append([]byte(nil), seq...)
-       ret := tileLibRef{tag: tag, variant: tileVariantID(len(tilelib.variant[tag]))}
+       variant := tileVariantID(len(tilelib.variant[tag]))
+       ret := tileLibRef{tag: tag, variant: variant}
        tilelib.mtx.Unlock()
 
        if tilelib.encoder != nil {
                tilelib.encoder.Encode(LibraryEntry{
                        TileVariants: []TileVariant{{
                                Tag:      tag,
+                               Variant:  variant,
                                Blake2b:  seqhash,
                                Sequence: seq,
                        }},