[MM-39229] - Migrate from gorp to sqlx in store/sqlstore/link_metadata_store.go (#18702)

* migrate from gorp to sqlx

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>

* fix INSERT query

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>

* fixes

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>

* fix Get function

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>

* fixes - serialize metadata_Data to JSON

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>

* fixes - wrap metadataBytes with string

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>
Этот коммит содержится в:
Penthaa Patel
2021-10-19 19:49:45 +05:30
коммит произвёл GitHub
родитель e12e0df447
Коммит 078fdd8422

Просмотреть файл

@@ -5,6 +5,7 @@ package sqlstore
import (
"database/sql"
"encoding/json"
sq "github.com/Masterminds/squirrel"
"github.com/pkg/errors"
@@ -44,8 +45,20 @@ func (s SqlLinkMetadataStore) Save(metadata *model.LinkMetadata) (*model.LinkMet
}
metadata.PreSave()
metadataBytes, err := json.Marshal(metadata.Data)
if err != nil {
return nil, errors.Wrap(err, "could not serialize metadataBytes to JSON")
}
err := s.GetMaster().Insert(metadata)
query, args, err := s.getQueryBuilder().
Insert("LinkMetadata").
Columns("Hash", "URL", "Timestamp", "Type", "Data").
Values(metadata.Hash, metadata.URL, metadata.Timestamp, metadata.Type, string(metadataBytes)).
ToSql()
if err != nil {
return nil, errors.Wrap(err, "metadata_tosql")
}
_, err = s.GetMasterX().Exec(query, args...)
if err != nil && !IsUniqueConstraintError(err, []string{"PRIMARY", "linkmetadata_pkey"}) {
return nil, errors.Wrap(err, "could not save link metadata")
}
@@ -54,7 +67,7 @@ func (s SqlLinkMetadataStore) Save(metadata *model.LinkMetadata) (*model.LinkMet
}
func (s SqlLinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetadata, error) {
var metadata *model.LinkMetadata
var metadata model.LinkMetadata
query, args, err := s.getQueryBuilder().
Select("*").
From("LinkMetadata").
@@ -63,7 +76,7 @@ func (s SqlLinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetad
if err != nil {
return nil, errors.Wrap(err, "could not create query with querybuilder")
}
err = s.GetReplica().SelectOne(&metadata, query, args...)
err = s.GetReplicaX().Get(&metadata, query, args...)
if err != nil {
if err == sql.ErrNoRows {
return nil, store.NewErrNotFound("LinkMetadata", "url="+url)
@@ -76,5 +89,5 @@ func (s SqlLinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetad
return nil, errors.Wrapf(err, "could not deserialize metadata to concrete type for url=%s", url)
}
return metadata, nil
return &metadata, nil
}