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
2 changes: 1 addition & 1 deletion book/src/tutorials/join.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ produces
{name:"banana",color:"yellow",flavor:"sweet",eater:"quinn"}
{name:"dates",color:"brown",flavor:"sweet",note:"in season",eater:"quinn"}
{name:"strawberry",color:"red",flavor:"sweet",eater:"quinn"}
{name:"apple",color:"red",flavor:"tart",eater:"chris"}
{name:"apple",color:"red",flavor:"tart",eater:"morgan"}
{name:"apple",color:"red",flavor:"tart",eater:"chris"}
```

### Alternate Syntax
Expand Down
190 changes: 183 additions & 7 deletions db/writer.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
package db

import (
"bytes"
"cmp"
"context"
"io"
"slices"
"strings"
"sync/atomic"

"github.com/superdb/super"
"github.com/superdb/super/bsup"
"github.com/superdb/super/db/data"
"github.com/superdb/super/order"
"github.com/superdb/super/runtime/sam/expr"
"github.com/superdb/super/pkg/field"
"github.com/superdb/super/runtime/expr"
samexpr "github.com/superdb/super/runtime/sam/expr"
"github.com/superdb/super/sbuf"
"github.com/superdb/super/vector"
"github.com/superdb/super/vector/vbuild"
Expand Down Expand Up @@ -117,18 +123,18 @@ func (s *ImportStats) Copy() ImportStats {
}
}

func ImportComparator(sctx *super.Context, pool *Pool) *expr.Comparator {
var exprs []expr.SortExpr
func ImportComparator(sctx *super.Context, pool *Pool) *samexpr.Comparator {
var exprs []samexpr.SortExpr
for _, s := range pool.SortKeys {
exprs = append(exprs, expr.NewSortExpr(expr.NewDottedExpr(sctx, s.Key), s.Order, s.Order.NullsMax(true)))
exprs = append(exprs, samexpr.NewSortExpr(samexpr.NewDottedExpr(sctx, s.Key), s.Order, s.Order.NullsMax(true)))
}
var o order.Which
if !pool.SortKeys.IsNil() {
o = pool.SortKeys.Primary().Order
}
// valueAsBytes establishes a total order.
exprs = append(exprs, expr.NewSortExpr(&valueAsBytes{}, o, o.NullsMax(true)))
return expr.NewComparator(exprs...)
exprs = append(exprs, samexpr.NewSortExpr(&valueAsBytes{}, o, o.NullsMax(true)))
return samexpr.NewComparator(exprs...)
}

type valueAsBytes struct{}
Expand All @@ -138,8 +144,11 @@ func (v *valueAsBytes) Eval(val super.Value) super.Value {
}

func (w *Writer) sort(vec vector.Any) (vector.Any, super.Value, super.Value) {
if vec, minVal, maxVal := w.fastSort(vec); vec != nil {
return vec, minVal, maxVal
}
c := ImportComparator(w.sctx, w.pool)
primaryKey := expr.NewDottedExpr(w.sctx, w.pool.SortKeys.Primary().Key)
primaryKey := samexpr.NewDottedExpr(w.sctx, w.pool.SortKeys.Primary().Key)
reader := c.SortStableReader(sbuf.Materialize(vec).Values())
out := vector.NewDynamicValueBuilder()
var minVal, maxVal super.Value
Expand All @@ -162,3 +171,170 @@ func (w *Writer) sort(vec vector.Any) (vector.Any, super.Value, super.Value) {
out.Write(*val)
}
}

func (w *Writer) fastSort(vec vector.Any) (vector.Any, super.Value, super.Value) {
if len(w.pool.SortKeys) != 1 {
return nil, super.Value{}, super.Value{}
}
sortKey := w.pool.SortKeys[0]
return w.fastSortWithKey(vec, w.deref(vec, sortKey.Key), sortKey.Order)
}

func (w *Writer) fastSortWithKey(vec, key vector.Any, o order.Which) (vector.Any, super.Value, super.Value) {
switch key := key.(type) {
case *vector.Named:
return w.fastSortWithKey(vec, key.Any, o)
case *vector.Int:
idx := make([]uint32, len(key.Values))
for k := range idx {
idx[k] = uint32(k)
}
slices.SortStableFunc(idx, func(a, b uint32) int {
if o == order.Desc {
a, b = b, a
}
return cmp.Compare(key.Values[a], key.Values[b])
})
minVal := key.Values[0]
maxVal := key.Values[0]
for _, val := range key.Values[1:] {
if val < minVal {
minVal = val
} else if val > maxVal {
maxVal = val
}
}
if o == order.Desc {
minVal, maxVal = maxVal, minVal
}
return vector.NewView(vec, idx), super.NewInt(key.Type(), minVal), super.NewInt(key.Type(), maxVal)
case *vector.Uint:
idx := make([]uint32, len(key.Values))
for k := range idx {
idx[k] = uint32(k)
}
slices.SortStableFunc(idx, func(a, b uint32) int {
if o == order.Desc {
a, b = b, a
}
return cmp.Compare(key.Values[a], key.Values[b])
})
minVal := key.Values[0]
maxVal := key.Values[0]
for _, val := range key.Values[1:] {
if val < minVal {
minVal = val
} else if val > maxVal {
maxVal = val
}
}
if o == order.Desc {
minVal, maxVal = maxVal, minVal
}
return vector.NewView(vec, idx), super.NewUint(key.Type(), minVal), super.NewUint(key.Type(), maxVal)
case *vector.Float:
idx := make([]uint32, len(key.Values))
for k := range idx {
idx[k] = uint32(k)
}
slices.SortStableFunc(idx, func(a, b uint32) int {
if o == order.Desc {
a, b = b, a
}
return cmp.Compare(key.Values[a], key.Values[b])
})
minVal := key.Values[0]
maxVal := key.Values[0]
for _, val := range key.Values[1:] {
if val < minVal {
minVal = val
} else if val > maxVal {
maxVal = val
}
}
if o == order.Desc {
minVal, maxVal = maxVal, minVal
}
return vector.NewView(vec, idx), super.NewFloat(key.Type(), minVal), super.NewFloat(key.Type(), maxVal)
case *vector.String:
idx := make([]uint32, key.Len())
for k := range idx {
idx[k] = uint32(k)
}
slices.SortStableFunc(idx, func(a, b uint32) int {
if o == order.Desc {
a, b = b, a
}
return strings.Compare(key.Value(a), key.Value(b))
})
minVal := key.Value(0)
maxVal := key.Value(0)
for k := range vec.Len() - 1 {
off := k + 1
if s := key.Value(off); s < minVal {
minVal = s
} else if s > maxVal {
maxVal = s
}
}
if o == order.Desc {
minVal, maxVal = maxVal, minVal
}
return vector.NewView(vec, idx), super.NewString(minVal), super.NewString(maxVal)
case *vector.Bytes:
idx := make([]uint32, key.Len())
for k := range idx {
idx[k] = uint32(k)
}
slices.SortStableFunc(idx, func(a, b uint32) int {
if o == order.Desc {
a, b = b, a
}
return bytes.Compare(key.Value(a), key.Value(b))
})
minVal := key.Value(0)
maxVal := key.Value(0)
for k := range vec.Len() - 1 {
off := k + 1
if b := key.Value(off); bytes.Compare(b, minVal) < 0 {
minVal = b
} else if bytes.Compare(b, maxVal) > 0 {
maxVal = b
}
}
if o == order.Desc {
minVal, maxVal = maxVal, minVal
}
return vector.NewView(vec, idx), super.NewBytes(minVal), super.NewBytes(maxVal)
case *vector.IP:
idx := make([]uint32, len(key.Values))
for k := range idx {
idx[k] = uint32(k)
}
slices.SortStableFunc(idx, func(a, b uint32) int {
if o == order.Desc {
a, b = b, a
}
return key.Values[a].Compare(key.Values[b])
})
minVal := key.Values[0]
maxVal := key.Values[0]
for _, val := range key.Values[1:] {
if val.Compare(minVal) < 0 {
minVal = val
} else if val.Compare(maxVal) > 0 {
maxVal = val
}
}
if o == order.Desc {
minVal, maxVal = maxVal, minVal
}
return vector.NewView(vec, idx), super.NewIP(minVal), super.NewIP(maxVal)
}
return nil, super.Value{}, super.Value{}
}

func (w *Writer) deref(vec vector.Any, path field.Path) vector.Any {
e := expr.NewDottedExpr(w.sctx, path.Chain())
return e.Eval(vec)
}
4 changes: 2 additions & 2 deletions db/ztests/seek-index-overlap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ outputs:
{count:1150}
- name: stderr
data: |
{bytes_read:33519,bytes_matched:33519,records_read:1150,records_matched:1150}
{bytes_read:33503,bytes_matched:33503,records_read:1150,records_matched:1150}
===
{bytes_read:35654,bytes_matched:35654,records_read:1150,records_matched:1150}
{bytes_read:35634,bytes_matched:35634,records_read:1150,records_matched:1150}
Loading