Skip to content

Suppress unnecessary duplicate key errors in the IssuanceChainStorage PostgreSQL implementation #1678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roger2hk merged 2 commits into from
Mar 21, 2025
Merged

Suppress unnecessary duplicate key errors in the IssuanceChainStorage PostgreSQL implementation #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f90098d
In the IssuanceChainStorage PostgreSQL implementation, don't throw du…
robstradling Mar 18, 2025
643ad3b
Update CHANGELOG.md
robstradling Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
* [ct_hammer] support HTTPS and Bearer token for Authentication.
* [preloader] support Bearer token Authentication for non temporal logs.

### CTFE Storage Saving: Extra Data Issuance Chain Deduplication

* Suppress unnecessary duplicate key errors in the IssuanceChainStorage PostgreSQL implementation by @robstradling in https://github.com/google/certificate-transparency-go/pull/1678

## v1.3.1

* Add AllLogListSignatureURL by @AlexLaroche in https://github.com/google/certificate-transparency-go/pull/1634
Expand Down
15 changes: 2 additions & 13 deletions trillian/ctfe/storage/postgresql/postgresql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,14 @@ import (
"errors"
"strings"

"github.com/jackc/pgerrcode"
"github.com/jackc/pgx/v5/pgconn"
_ "github.com/jackc/pgx/v5/stdlib"

"k8s.io/klog/v2"
)

const (
selectIssuanceChainByKeySQL = "SELECT c.ChainValue FROM IssuanceChain AS c WHERE c.IdentityHash = $1"
insertIssuanceChainSQL = "INSERT INTO IssuanceChain(IdentityHash, ChainValue) VALUES ($1, $2)"
insertIssuanceChainSQL = "INSERT INTO IssuanceChain(IdentityHash, ChainValue) VALUES ($1, $2) ON CONFLICT DO NOTHING"
)

// IssuanceChainStorage is a PostgreSQL implementation of the IssuanceChainStorage interface.
Expand Down Expand Up @@ -68,16 +66,7 @@ func (s *IssuanceChainStorage) FindByKey(ctx context.Context, key []byte) ([]byt
// Add inserts the key-value pair of issuance chain.
func (s *IssuanceChainStorage) Add(ctx context.Context, key []byte, chain []byte) error {
_, err := s.db.ExecContext(ctx, insertIssuanceChainSQL, key, chain)
if err != nil {
// Ignore duplicated key error.
var postgresqlErr *pgconn.PgError
if errors.As(err, &postgresqlErr) && postgresqlErr.Code == pgerrcode.UniqueViolation {
return nil
}
return err
}

return nil
return err
}

// open takes the data source name and returns the sql.DB object.
Expand Down
Loading