Skip to content

use type switch instead of Fprintf for grouping key #3296

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
merged 3 commits into from
Nov 11, 2025
Merged

use type switch instead of Fprintf for grouping key #3296

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d958e9
manually write strings
Nov 10, 2025
a1a954b
use type switch instead of fprintf for grouping key
Nov 10, 2025
786f3a1
check for error
Nov 11, 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
90 changes: 65 additions & 25 deletions sql/hash/hash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,40 +60,80 @@ func HashOf(ctx *sql.Context, sch sql.Schema, row sql.Row) (uint64, error) {
return 0, fmt.Errorf("error unwrapping value: %w", err)
}

// TODO: we may not always have the type information available, so we check schema length.
// Then, defer to original behavior
if i >= len(sch) || v == nil {
_, err := fmt.Fprintf(hash, "%v", v)
if err != nil {
if v == nil {
if _, err := hash.WriteString("<nil>"); err != nil {
return 0, err
}
continue
}

switch typ := sch[i].Type.(type) {
case sql.ExtendedType:
// TODO: Doltgres follows Postgres conventions which don't align with the expectations of MySQL,
// so we're using the old (probably incorrect) behavior for now
_, err = fmt.Fprintf(hash, "%v", v)
if err != nil {
return 0, err
// TODO: we may not always have the type information available, so we check schema length.
// Then, defer to original behavior
if i < len(sch) {
switch typ := sch[i].Type.(type) {
case sql.ExtendedType:
// TODO: Doltgres follows Postgres conventions which don't align with the expectations of MySQL,
// so we're using the old (probably incorrect) behavior for now
_, err := hash.WriteString(fmt.Sprintf("%v", v))
if err != nil {
return 0, err
}
continue
case types.StringType:
var strVal string
strVal, err = types.ConvertToString(ctx, v, typ, nil)
if err != nil {
return 0, err
}
err = typ.Collation().WriteWeightString(hash, strVal)
if err != nil {
return 0, err
}
continue
}
case types.StringType:
var strVal string
strVal, err = types.ConvertToString(ctx, v, typ, nil)
if err != nil {
return 0, err
}
switch v := v.(type) {
case int:
_, err = hash.WriteString(strconv.FormatInt(int64(v), 10))
case int8:
_, err = hash.WriteString(strconv.FormatInt(int64(v), 10))
case int16:
_, err = hash.WriteString(strconv.FormatInt(int64(v), 10))
case int32:
_, err = hash.WriteString(strconv.FormatInt(int64(v), 10))
case int64:
_, err = hash.WriteString(strconv.FormatInt(v, 10))
case uint:
_, err = hash.WriteString(strconv.FormatUint(uint64(v), 10))
case uint8:
_, err = hash.WriteString(strconv.FormatUint(uint64(v), 10))
case uint16:
_, err = hash.WriteString(strconv.FormatUint(uint64(v), 10))
case uint32:
_, err = hash.WriteString(strconv.FormatUint(uint64(v), 10))
case uint64:
_, err = hash.WriteString(strconv.FormatUint(v, 10))
case float32:
str := strconv.FormatFloat(float64(v), 'f', -1, 32)
if str == "-0" {
str = "0"
}
err = typ.Collation().WriteWeightString(hash, strVal)
if err != nil {
return 0, err
_, err = hash.WriteString(str)
case float64:
str := strconv.FormatFloat(v, 'f', -1, 64)
if str == "-0" {
str = "0"
}
_, err = hash.WriteString(str)
case string:
_, err = hash.WriteString(v)
case []byte:
_, err = hash.Write(v)
default:
// TODO: probably much faster to do this with a type switch
_, err = fmt.Fprintf(hash, "%v", v)
if err != nil {
return 0, err
}
_, err = hash.WriteString(fmt.Sprintf("%v", v))
}
if err != nil {
return 0, err
}
}
return hash.Sum64(), nil
Expand Down