Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
6a304b875a
|
|||
d12bf23b46
|
|||
52f7f6e690
|
|||
b1e3891256
|
|||
bdf5b53c20
|
|||
496c4e4f59
|
|||
deab986caf
|
|||
9d9a6f1c6e
|
|||
06a37f37b7
|
35
dataext/merge.go
Normal file
35
dataext/merge.go
Normal file
@@ -0,0 +1,35 @@
|
||||
package dataext
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
)
|
||||
|
||||
func ObjectMerge[T1 any, T2 any](base T1, override T2) T1 {
|
||||
|
||||
reflBase := reflect.ValueOf(&base).Elem()
|
||||
reflOvrd := reflect.ValueOf(&override).Elem()
|
||||
|
||||
for i := 0; i < reflBase.NumField(); i++ {
|
||||
|
||||
fieldBase := reflBase.Field(i)
|
||||
fieldOvrd := reflOvrd.Field(i)
|
||||
|
||||
if fieldBase.Kind() != reflect.Ptr || fieldOvrd.Kind() != reflect.Ptr {
|
||||
continue
|
||||
}
|
||||
|
||||
kindBase := fieldBase.Type().Elem().Kind()
|
||||
kindOvrd := fieldOvrd.Type().Elem().Kind()
|
||||
|
||||
if kindBase != kindOvrd {
|
||||
continue
|
||||
}
|
||||
|
||||
if !fieldOvrd.IsNil() {
|
||||
fieldBase.Set(fieldOvrd.Elem().Addr())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return base
|
||||
}
|
70
dataext/merge_test.go
Normal file
70
dataext/merge_test.go
Normal file
@@ -0,0 +1,70 @@
|
||||
package dataext
|
||||
|
||||
import (
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestObjectMerge(t *testing.T) {
|
||||
type A struct {
|
||||
Field1 *int
|
||||
Field2 *string
|
||||
Field3 *float64
|
||||
Field4 *bool
|
||||
OnlyA int64
|
||||
DiffType int
|
||||
}
|
||||
type B struct {
|
||||
Field1 *int
|
||||
Field2 *string
|
||||
Field3 *float64
|
||||
Field4 *bool
|
||||
OnlyB int64
|
||||
DiffType string
|
||||
}
|
||||
|
||||
valueA := A{
|
||||
Field1: nil,
|
||||
Field2: langext.Ptr("99"),
|
||||
Field3: langext.Ptr(12.2),
|
||||
Field4: nil,
|
||||
OnlyA: 1,
|
||||
DiffType: 2,
|
||||
}
|
||||
|
||||
valueB := B{
|
||||
Field1: langext.Ptr(12),
|
||||
Field2: nil,
|
||||
Field3: langext.Ptr(13.2),
|
||||
Field4: nil,
|
||||
OnlyB: 1,
|
||||
DiffType: "X",
|
||||
}
|
||||
|
||||
valueMerge := ObjectMerge(valueA, valueB)
|
||||
|
||||
assertPtrEqual(t, "Field1", valueMerge.Field1, valueB.Field1)
|
||||
assertPtrEqual(t, "Field2", valueMerge.Field2, valueA.Field2)
|
||||
assertPtrEqual(t, "Field3", valueMerge.Field3, valueB.Field3)
|
||||
assertPtrEqual(t, "Field4", valueMerge.Field4, nil)
|
||||
|
||||
}
|
||||
|
||||
func assertPtrEqual[T1 comparable](t *testing.T, ident string, actual *T1, expected *T1) {
|
||||
if actual == nil && expected == nil {
|
||||
return
|
||||
}
|
||||
if actual != nil && expected != nil {
|
||||
if *actual != *expected {
|
||||
t.Errorf("[%s] values differ: Actual: '%v', Expected: '%v'", ident, *actual, *expected)
|
||||
} else {
|
||||
return
|
||||
}
|
||||
}
|
||||
if actual == nil && expected != nil {
|
||||
t.Errorf("[%s] values differ: Actual: nil, Expected: not-nil", ident)
|
||||
}
|
||||
if actual != nil && expected == nil {
|
||||
t.Errorf("[%s] values differ: Actual: not-nil, Expected: nil", ident)
|
||||
}
|
||||
}
|
@@ -7,3 +7,11 @@ func FormatBool(v bool, strTrue string, strFalse string) string {
|
||||
return strFalse
|
||||
}
|
||||
}
|
||||
|
||||
func Conditional[T any](v bool, resTrue T, resFalse T) T {
|
||||
if v {
|
||||
return resTrue
|
||||
} else {
|
||||
return resFalse
|
||||
}
|
||||
}
|
||||
|
104
syncext/atomic.go
Normal file
104
syncext/atomic.go
Normal file
@@ -0,0 +1,104 @@
|
||||
package syncext
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
|
||||
type AtomicBool struct {
|
||||
v int32
|
||||
waiter chan bool // unbuffered
|
||||
}
|
||||
|
||||
func NewAtomicBool(value bool) *AtomicBool {
|
||||
if value {
|
||||
return &AtomicBool{v: 1, waiter: make(chan bool)}
|
||||
} else {
|
||||
return &AtomicBool{v: 0, waiter: make(chan bool)}
|
||||
}
|
||||
}
|
||||
|
||||
func (a *AtomicBool) Get() bool {
|
||||
return atomic.LoadInt32(&a.v) == 1
|
||||
}
|
||||
|
||||
func (a *AtomicBool) Set(value bool) {
|
||||
if value {
|
||||
atomic.StoreInt32(&a.v, 1)
|
||||
} else {
|
||||
atomic.StoreInt32(&a.v, 0)
|
||||
}
|
||||
|
||||
select {
|
||||
case a.waiter <- value:
|
||||
// message sent
|
||||
default:
|
||||
// no receiver on channel
|
||||
}
|
||||
}
|
||||
|
||||
func (a *AtomicBool) Wait(waitFor bool) {
|
||||
if a.Get() == waitFor {
|
||||
return
|
||||
}
|
||||
|
||||
for {
|
||||
if v, ok := ReadChannelWithTimeout(a.waiter, 128*time.Millisecond); ok {
|
||||
if v == waitFor {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if a.Get() == waitFor {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (a *AtomicBool) WaitWithTimeout(timeout time.Duration, waitFor bool) error {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
||||
defer cancel()
|
||||
return a.WaitWithContext(ctx, waitFor)
|
||||
}
|
||||
|
||||
func (a *AtomicBool) WaitWithContext(ctx context.Context, waitFor bool) error {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if a.Get() == waitFor {
|
||||
return nil
|
||||
}
|
||||
|
||||
for {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
timeOut := 128 * time.Millisecond
|
||||
|
||||
if dl, ok := ctx.Deadline(); ok {
|
||||
timeOutMax := dl.Sub(time.Now())
|
||||
if timeOutMax <= 0 {
|
||||
timeOut = 0
|
||||
} else if 0 < timeOutMax && timeOutMax < timeOut {
|
||||
timeOut = timeOutMax
|
||||
}
|
||||
}
|
||||
|
||||
if v, ok := ReadChannelWithTimeout(a.waiter, timeOut); ok {
|
||||
if v == waitFor {
|
||||
return nil
|
||||
}
|
||||
} else {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if a.Get() == waitFor {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
45
syncext/channel.go
Normal file
45
syncext/channel.go
Normal file
@@ -0,0 +1,45 @@
|
||||
package syncext
|
||||
|
||||
import (
|
||||
"time"
|
||||
)
|
||||
|
||||
// https://gobyexample.com/non-blocking-channel-operations
|
||||
// https://gobyexample.com/timeouts
|
||||
// https://groups.google.com/g/golang-nuts/c/Oth9CmJPoqo
|
||||
|
||||
func ReadChannelWithTimeout[T any](c chan T, timeout time.Duration) (T, bool) {
|
||||
select {
|
||||
case msg := <-c:
|
||||
return msg, true
|
||||
case <-time.After(timeout):
|
||||
return *new(T), false
|
||||
}
|
||||
}
|
||||
|
||||
func WriteChannelWithTimeout[T any](c chan T, msg T, timeout time.Duration) bool {
|
||||
select {
|
||||
case c <- msg:
|
||||
return true
|
||||
case <-time.After(timeout):
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func ReadNonBlocking[T any](c chan T) (T, bool) {
|
||||
select {
|
||||
case msg := <-c:
|
||||
return msg, true
|
||||
default:
|
||||
return *new(T), false
|
||||
}
|
||||
}
|
||||
|
||||
func WriteNonBlocking[T any](c chan T, msg T) bool {
|
||||
select {
|
||||
case c <- msg:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
121
syncext/channel_test.go
Normal file
121
syncext/channel_test.go
Normal file
@@ -0,0 +1,121 @@
|
||||
package syncext
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestTimeoutReadBuffered(t *testing.T) {
|
||||
c := make(chan int, 1)
|
||||
|
||||
go func() {
|
||||
time.Sleep(200 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if ok {
|
||||
t.Error("Read success, but should timeout")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTimeoutReadBigBuffered(t *testing.T) {
|
||||
c := make(chan int, 128)
|
||||
|
||||
go func() {
|
||||
time.Sleep(200 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if ok {
|
||||
t.Error("Read success, but should timeout")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTimeoutReadUnbuffered(t *testing.T) {
|
||||
c := make(chan int)
|
||||
|
||||
go func() {
|
||||
time.Sleep(200 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if ok {
|
||||
t.Error("Read success, but should timeout")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNoTimeoutAfterStartReadBuffered(t *testing.T) {
|
||||
c := make(chan int, 1)
|
||||
|
||||
go func() {
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNoTimeoutAfterStartReadBigBuffered(t *testing.T) {
|
||||
c := make(chan int, 128)
|
||||
|
||||
go func() {
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNoTimeoutAfterStartReadUnbuffered(t *testing.T) {
|
||||
c := make(chan int)
|
||||
|
||||
go func() {
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
c <- 112
|
||||
}()
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 100*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestNoTimeoutBeforeStartReadBuffered(t *testing.T) {
|
||||
c := make(chan int, 1)
|
||||
|
||||
c <- 112
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 10*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNoTimeoutBeforeStartReadBigBuffered(t *testing.T) {
|
||||
c := make(chan int, 128)
|
||||
|
||||
c <- 112
|
||||
|
||||
_, ok := ReadChannelWithTimeout(c, 10*time.Millisecond)
|
||||
|
||||
if !ok {
|
||||
t.Error("Read timeout, but should have succeeded")
|
||||
}
|
||||
}
|
@@ -2,59 +2,36 @@ package timeext
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"time"
|
||||
)
|
||||
|
||||
func FromSeconds(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(time.Second))
|
||||
func FromNanoseconds[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Nanosecond)))
|
||||
}
|
||||
|
||||
func FromSecondsInt32(v int32) time.Duration {
|
||||
return time.Duration(int64(v) * int64(time.Second))
|
||||
func FromMicroseconds[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Microsecond)))
|
||||
}
|
||||
|
||||
func FromSecondsInt64(v int64) time.Duration {
|
||||
return time.Duration(v * int64(time.Second))
|
||||
func FromMilliseconds[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Millisecond)))
|
||||
}
|
||||
|
||||
func FromSecondsFloat32(v float32) time.Duration {
|
||||
return time.Duration(int64(v * float32(time.Second)))
|
||||
func FromSeconds[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Second)))
|
||||
}
|
||||
|
||||
func FromSecondsFloat64(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Second)))
|
||||
func FromMinutes[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Minute)))
|
||||
}
|
||||
|
||||
func FromSecondsFloat(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Second)))
|
||||
func FromHours[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(time.Hour)))
|
||||
}
|
||||
|
||||
func FromMinutes(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(time.Minute))
|
||||
}
|
||||
|
||||
func FromMinutesFloat(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Minute)))
|
||||
}
|
||||
|
||||
func FromMinutesFloat64(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Minute)))
|
||||
}
|
||||
|
||||
func FromHoursFloat64(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Hour)))
|
||||
}
|
||||
|
||||
func FromDays(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(24) * int64(time.Hour))
|
||||
}
|
||||
|
||||
func FromMilliseconds(v int) time.Duration {
|
||||
return time.Duration(int64(v) * int64(time.Millisecond))
|
||||
}
|
||||
|
||||
func FromMillisecondsFloat(v float64) time.Duration {
|
||||
return time.Duration(int64(v * float64(time.Millisecond)))
|
||||
func FromDays[T langext.NumberConstraint](v T) time.Duration {
|
||||
return time.Duration(int64(float64(v) * float64(24) * float64(time.Hour)))
|
||||
}
|
||||
|
||||
func FormatNaturalDurationEnglish(iv time.Duration) string {
|
||||
|
Reference in New Issue
Block a user