Skip to content
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
8 changes: 4 additions & 4 deletions bitmap_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (c *bitmapCache) AddToNumericBitmap(ctx context.Context, name string, value
k := nameValue[uint64]{name: name, value: value}
bitmap, ok := c.numericBitmaps[k]
if !ok {
bitmap, err = c.st.GetNumericAttributeValueBitmap(ctx, store.GetNumericAttributeValueBitmapParams{Name: name, Value: value})
bitmap, err = c.st.GetNumericAttributeValueBitmap(ctx, store.GetNumericAttributeValueBitmapParams{Name: name, Value: store.NumericValueToSQL(value)})

if err != nil && err != sql.ErrNoRows {
return fmt.Errorf("failed to get numeric attribute %q value %q bitmap: %w", name, value, err)
Expand All @@ -103,7 +103,7 @@ func (c *bitmapCache) RemoveFromNumericBitmap(ctx context.Context, name string,
k := nameValue[uint64]{name: name, value: value}
bitmap, ok := c.numericBitmaps[k]
if !ok {
bitmap, err = c.st.GetNumericAttributeValueBitmap(ctx, store.GetNumericAttributeValueBitmapParams{Name: name, Value: value})
bitmap, err = c.st.GetNumericAttributeValueBitmap(ctx, store.GetNumericAttributeValueBitmapParams{Name: name, Value: store.NumericValueToSQL(value)})

if err != nil && err != sql.ErrNoRows {
return fmt.Errorf("failed to get numeric attribute %q value %q bitmap: %w", name, value, err)
Expand Down Expand Up @@ -172,14 +172,14 @@ func (c *bitmapCache) Flush(ctx context.Context) (err error) {
for k, bitmap := range c.numericBitmaps {

if bitmap.IsEmpty() {
err = c.st.DeleteNumericAttributeValueBitmap(ctx, store.DeleteNumericAttributeValueBitmapParams{Name: k.name, Value: k.value})
err = c.st.DeleteNumericAttributeValueBitmap(ctx, store.DeleteNumericAttributeValueBitmapParams{Name: k.name, Value: store.NumericValueToSQL(k.value)})
if err != nil {
return fmt.Errorf("failed to delete numeric attribute %q value %q bitmap: %w", k.name, k.value, err)
}
continue
}

err = c.st.UpsertNumericAttributeValueBitmap(ctx, store.UpsertNumericAttributeValueBitmapParams{Name: k.name, Value: k.value, Bitmap: bitmap})
err = c.st.UpsertNumericAttributeValueBitmap(ctx, store.UpsertNumericAttributeValueBitmapParams{Name: k.name, Value: store.NumericValueToSQL(k.value), Bitmap: bitmap})
if err != nil {
return fmt.Errorf("failed to upsert numeric attribute %q value %q bitmap: %w", k.name, k.value, err)
}
Expand Down
16 changes: 8 additions & 8 deletions query/evaluate.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func (e *LessThan) Evaluate(
} else {
bitmaps, err = q.EvaluateNumericAttributeValueLowerThan(ctx, store.EvaluateNumericAttributeValueLowerThanParams{
Name: e.Var,
Value: *e.Value.Number,
Value: store.NumericValueToSQL(*e.Value.Number),
})
if err != nil {
return nil, err
Expand Down Expand Up @@ -184,7 +184,7 @@ func (e *LessOrEqualThan) Evaluate(
} else {
bitmaps, err = q.EvaluateNumericAttributeValueLessOrEqualThan(ctx, store.EvaluateNumericAttributeValueLessOrEqualThanParams{
Name: e.Var,
Value: *e.Value.Number,
Value: store.NumericValueToSQL(*e.Value.Number),
})
if err != nil {
return nil, err
Expand Down Expand Up @@ -219,7 +219,7 @@ func (e *GreaterThan) Evaluate(
} else {
bitmaps, err = q.EvaluateNumericAttributeValueGreaterThan(ctx, store.EvaluateNumericAttributeValueGreaterThanParams{
Name: e.Var,
Value: *e.Value.Number,
Value: store.NumericValueToSQL(*e.Value.Number),
})
if err != nil {
return nil, err
Expand Down Expand Up @@ -254,7 +254,7 @@ func (e *GreaterOrEqualThan) Evaluate(
} else {
bitmaps, err = q.EvaluateNumericAttributeValueGreaterOrEqualThan(ctx, store.EvaluateNumericAttributeValueGreaterOrEqualThanParams{
Name: e.Var,
Value: *e.Value.Number,
Value: store.NumericValueToSQL(*e.Value.Number),
})
if err != nil {
return nil, err
Expand Down Expand Up @@ -318,7 +318,7 @@ func (e *Equality) Evaluate(
var bitmaps []*store.Bitmap
bitmaps, err = q.EvaluateNumericAttributeValueNotEqual(ctx, store.EvaluateNumericAttributeValueNotEqualParams{
Name: e.Var,
Value: *e.Value.Number,
Value: store.NumericValueToSQL(*e.Value.Number),
})
if err != nil {
return nil, err
Expand All @@ -333,7 +333,7 @@ func (e *Equality) Evaluate(
} else {
bitmap, err := q.EvaluateNumericAttributeValueEqual(ctx, store.EvaluateNumericAttributeValueEqualParams{
Name: e.Var,
Value: *e.Value.Number,
Value: store.NumericValueToSQL(*e.Value.Number),
})

if err == sql.ErrNoRows {
Expand Down Expand Up @@ -389,15 +389,15 @@ func (e *Inclusion) Evaluate(
if e.IsNot {
bitmaps, err = q.EvaluateNumericAttributeValueNotInclusion(ctx, store.EvaluateNumericAttributeValueNotInclusionParams{
Name: e.Var,
Values: e.Values.Numbers,
Values: store.NumericValuesToSQL(e.Values.Numbers),
})
if err != nil {
return nil, err
}
} else {
bitmaps, err = q.EvaluateNumericAttributeValueInclusion(ctx, store.EvaluateNumericAttributeValueInclusionParams{
Name: e.Var,
Values: e.Values.Numbers,
Values: store.NumericValuesToSQL(e.Values.Numbers),
})
if err != nil {
return nil, err
Expand Down
Loading
Loading