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

分库分表: 排序merger的nullable数据的支持 #195

Merged
merged 7 commits into from
May 8, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 1 addition & 0 deletions internal/merger/internal/errs/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ var (
ErrMergerAggregateHasEmptyRows = errors.New("merger: 聚合函数计算时rowsList有一个或多个为空")
ErrMergerInvalidAggregateColumnIndex = errors.New("merger: ColumnInfo的index不合法")
ErrMergerAggregateFuncNotFound = errors.New("merger: 聚合函数方法未找到")
ErrMergerNullAble = errors.New("merger: 接收数据的类型需要为sql.NullXXX")
juniaoshaonian marked this conversation as resolved.
Show resolved Hide resolved
)

func NewRepeatSortColumn(column string) error {
Expand Down
92 changes: 91 additions & 1 deletion internal/merger/sortmerger/heap.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@

package sortmerger

import "reflect"
import (
"database/sql"
"reflect"
)

var compareFuncMapping = map[reflect.Kind]func(any, any, Order) int{
reflect.Int: compare[int],
Expand All @@ -30,6 +33,7 @@ var compareFuncMapping = map[reflect.Kind]func(any, any, Order) int{
reflect.Float64: compare[float64],
reflect.String: compare[string],
reflect.Uint: compare[uint],
reflect.Struct: compareNullable,
}

type Heap struct {
Expand Down Expand Up @@ -92,3 +96,89 @@ func compare[T Ordered](ii any, jj any, order Order) int {
return 0
}
}

func compareNullable(ii any, jj any, order Order) int {
juniaoshaonian marked this conversation as resolved.
Show resolved Hide resolved
switch ii.(type) {
case sql.NullString:
i, j := ii.(sql.NullString), jj.(sql.NullString)
if !i.Valid && !j.Valid {
return 0
}
if !i.Valid && order == ASC || !j.Valid && order == DESC {
return -1
} else if !i.Valid && order == DESC || !j.Valid && order == ASC {
return 1
}
return compare[string](i.String, j.String, order)
case sql.NullFloat64:
i, j := ii.(sql.NullFloat64), jj.(sql.NullFloat64)
if !i.Valid && !j.Valid {
return 0
}
if !i.Valid && order == ASC || !j.Valid && order == DESC {
return -1
} else if !i.Valid && order == DESC || !j.Valid && order == ASC {
return 1
}
return compare[float64](i.Float64, j.Float64, order)
case sql.NullInt64:
i, j := ii.(sql.NullInt64), jj.(sql.NullInt64)
if !i.Valid && !j.Valid {
return 0
}
if !i.Valid && order == ASC || !j.Valid && order == DESC {
return -1
} else if !i.Valid && order == DESC || !j.Valid && order == ASC {
return 1
}
return compare[int64](i.Int64, j.Int64, order)
case sql.NullInt16:
i, j := ii.(sql.NullInt16), jj.(sql.NullInt16)
if !i.Valid && !j.Valid {
return 0
}
if !i.Valid && order == ASC || !j.Valid && order == DESC {
return -1
} else if !i.Valid && order == DESC || !j.Valid && order == ASC {
return 1
}
return compare[int16](i.Int16, j.Int16, order)
case sql.NullInt32:
i, j := ii.(sql.NullInt32), jj.(sql.NullInt32)
if !i.Valid && !j.Valid {
return 0
}
if !i.Valid && order == ASC || !j.Valid && order == DESC {
return -1
} else if !i.Valid && order == DESC || !j.Valid && order == ASC {
return 1
}
return compare[int32](i.Int32, j.Int32, order)
case sql.NullByte:
i, j := ii.(sql.NullByte), jj.(sql.NullByte)
if !i.Valid && !j.Valid {
return 0
}
if !i.Valid && order == ASC || !j.Valid && order == DESC {
return -1
} else if !i.Valid && order == DESC || !j.Valid && order == ASC {
return 1
}
return compare[byte](i.Byte, j.Byte, order)
case sql.NullTime:
i, j := ii.(sql.NullTime), jj.(sql.NullTime)
if !i.Valid && !j.Valid {
return 0
}
if !i.Valid && order == ASC || !j.Valid && order == DESC {
return -1
} else if !i.Valid && order == DESC || !j.Valid && order == ASC {
return 1
}
vali := i.Time.UnixMilli()
valj := j.Time.UnixMilli()
return compare[int64](vali, valj, order)
default:
return 0
}
}
Loading