Skip to content
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.

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

sqlbase: avoid decode/encode in Fingerprint #47728

Merged
merged 2 commits into from
Apr 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions pkg/cmd/roachtest/alterpk.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,6 @@ func registerAlterPK(r *testRegistry) {
},
})
r.Add(testSpec{
// TODO(yuzefovich): investigate #47598 and unskip this configuration.
Skip: "#47598",
Name: "alterpk-tpcc-500",
Owner: OwnerSQLSchema,
// Use a 4 node cluster -- 3 nodes will run cockroach, and the last will be the
Expand Down
12 changes: 9 additions & 3 deletions pkg/sql/sqlbase/encoded_datum.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,15 +279,21 @@ func (ed *EncDatum) Encode(
// fingerprints of a set of datums are appended together, the resulting
// fingerprint will uniquely identify the set.
func (ed *EncDatum) Fingerprint(typ *types.T, a *DatumAlloc, appendTo []byte) ([]byte, error) {
if err := ed.EnsureDecoded(typ, a); err != nil {
return nil, err
}
// Note: we don't ed.EnsureDecoded on top of this method, because the default
// case uses ed.Encode, which has a fast path if the encoded bytes are already
// the right encoding.
switch typ.Family() {
case types.JsonFamily:
if err := ed.EnsureDecoded(typ, a); err != nil {
return nil, err
}
// We must use value encodings without a column ID even if the EncDatum already
// is encoded with the value encoding so that the hashes are indeed unique.
return EncodeTableValue(appendTo, ColumnID(encoding.NoColumnID), ed.Datum, a.scratch)
case types.ArrayFamily:
if err := ed.EnsureDecoded(typ, a); err != nil {
return nil, err
}
// Arrays may contain composite data, so we cannot just value
// encode an array (that would give same-valued composite
// datums a different encoding).
Expand Down