Encode uuid in cursor storage instead of byte slice

mofirouz · mofirouz · commit b2df2c014791 · 2018-10-03T14:38:31.000+01:00
diff --git a/server/core_storage.go b/server/core_storage.go
@@ -23,6 +23,7 @@ import (
 	"fmt"
 
 	"context"
+
 	"github.com/cockroachdb/cockroach-go/crdb"
 	"github.com/gofrs/uuid"
 	"github.com/golang/protobuf/ptypes/timestamp"
@@ -34,7 +35,7 @@ import (
 
 type storageCursor struct {
 	Key    string
-	UserID []byte
+	UserID uuid.UUID
 	Read   int32
 }
 
@@ -286,7 +287,7 @@ func storageListObjects(rows *sql.Rows, cursor string) (*api.StorageObjectList,
 		}
 
 		if lastObject.UserId != "" {
-			newCursor.UserID = uuid.FromStringOrNil(lastObject.UserId).Bytes()
+			newCursor.UserID = uuid.FromStringOrNil(lastObject.UserId)
 		}
 
 		cursorBuf := new(bytes.Buffer)

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`	`"fmt"`
`24`	`24`
`25`	`25`	`"context"`
	`26`	`+`
`26`	`27`	`"github.com/cockroachdb/cockroach-go/crdb"`
`27`	`28`	`"github.com/gofrs/uuid"`
`28`	`29`	`"github.com/golang/protobuf/ptypes/timestamp"`
`@@ -34,7 +35,7 @@ import (`
`34`	`35`
`35`	`36`	`type storageCursor struct {`
`36`	`37`	`Key string`
`37`		`- UserID []byte`
	`38`	`+ UserID uuid.UUID`
`38`	`39`	`Read int32`
`39`	`40`	`}`
`40`	`41`
`@@ -286,7 +287,7 @@ func storageListObjects(rows sql.Rows, cursor string) (api.StorageObjectList,`
`286`	`287`	`}`
`287`	`288`
`288`	`289`	`if lastObject.UserId != "" {`
`289`		`- newCursor.UserID = uuid.FromStringOrNil(lastObject.UserId).Bytes()`
	`290`	`+ newCursor.UserID = uuid.FromStringOrNil(lastObject.UserId)`
`290`	`291`	`}`
`291`	`292`
`292`	`293`	`cursorBuf := new(bytes.Buffer)`