mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-20 19:38:55 -05:00
Code Issues Packages Projects Releases 167 Wiki Activity

[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

Browse Source
This commit is contained in:
JCOR11599
2023-02-15 19:37:37 +00:00
parent 2c18dcbd6d
commit 13b8f6517d
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/sqle/index/dolt_index.go
+17 -18
View File
@@ -19,11 +19,11 @@ import (
"encoding/binary"
"errors"
"fmt"
sqltypes "github.com/dolthub/go-mysql-server/sql/types"
"sync/atomic"
"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/go-mysql-server/sql/expression"
sqltypes "github.com/dolthub/go-mysql-server/sql/types"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable"
@@ -720,7 +720,6 @@ func (di *doltIndex) coversColumns(s *durableIndexState, cols []uint64) bool {
return false
}
var idxCols *schema.ColCollection
if types.IsFormat_DOLT(di.Format()) {
// prolly indexes can cover an index lookup using
@@ -971,17 +970,17 @@ func (di *doltIndex) prollySpatialRanges(ctx context.Context, ns tree.NodeStore,
field := prolly.RangeField{
Exact: false,
Lo: prolly.Bound{
Binding: true,
Binding: true,
Inclusive: true,
Value: minVal,
Value: minVal,
},
Hi: prolly.Bound{
Binding: true,
Binding: true,
Inclusive: true,
Value: maxVal,
Value: maxVal,
},
}
pranges[lvl] = prolly.Range {
pranges[lvl] = prolly.Range{
Fields: []prolly.RangeField{field},
Desc: di.keyBld.Desc,
Tup: tup,
@@ -991,7 +990,7 @@ func (di *doltIndex) prollySpatialRanges(ctx context.Context, ns tree.NodeStore,
// generate ranges for level 32 - 63
for lvl := 0; lvl < 32; lvl++ {
minVal, maxVal := make([]byte, 17), make([]byte, 17)
minVal[0], maxVal[0] = byte(lvl + 32), byte(lvl + 32)
minVal[0], maxVal[0] = byte(lvl+32), byte(lvl+32)
shamt := lvl << 1
zMin[0] = (zMin[0] >> shamt) << shamt
zMax[0] = (zMax[0] >> shamt) << shamt
@@ -1002,17 +1001,17 @@ func (di *doltIndex) prollySpatialRanges(ctx context.Context, ns tree.NodeStore,
field := prolly.RangeField{
Exact: false,
Lo: prolly.Bound{
Binding: true,
Binding: true,
Inclusive: true,
Value: minVal,
Value: minVal,
},
Hi: prolly.Bound{
Binding: true,
Binding: true,
Inclusive: true,
Value: maxVal,
Value: maxVal,
},
}
pranges[lvl + 32] = prolly.Range {
pranges[lvl+32] = prolly.Range{
Fields: []prolly.RangeField{field},
Desc: di.keyBld.Desc,
Tup: tup,
@@ -1025,17 +1024,17 @@ func (di *doltIndex) prollySpatialRanges(ctx context.Context, ns tree.NodeStore,
field := prolly.RangeField{
Exact: false,
Lo: prolly.Bound{
Binding: true,
Binding: true,
Inclusive: true,
Value: val,
Value: val,
},
Hi: prolly.Bound{
Binding: true,
Binding: true,
Inclusive: true,
Value: val,
Value: val,
},
}
pranges[64] = prolly.Range {
pranges[64] = prolly.Range{
Fields: []prolly.RangeField{field},
Desc: di.keyBld.Desc,
Tup: tup,
go/libraries/doltcore/sqle/index/z_encoding.go
-1
View File
@@ -152,7 +152,6 @@ func ZSort(points []types.Point) []types.Point {
return points
}
// ZCell converts the GeometryValue into a Cell
// Note: there is an inefficiency here where small polygons may be placed into a level that's significantly larger
// TODO: we could probably improve performance here by not using custom structs
go/libraries/doltcore/sqle/writer/prolly_index_writer.go
+2 -1
View File
@@ -19,13 +19,14 @@ import (
"io"
"strings"
"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable"
"github.com/dolthub/dolt/go/libraries/doltcore/schema"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/index"
"github.com/dolthub/dolt/go/store/prolly"
"github.com/dolthub/dolt/go/store/val"
"github.com/dolthub/go-mysql-server/sql"
)
func getPrimaryProllyWriter(ctx context.Context, t *doltdb.Table, sqlSch sql.Schema, sch schema.Schema) (prollyIndexWriter, error) {
go/store/val/codec.go
+1 -1
View File
@@ -633,7 +633,7 @@ func stringFromBytes(b []byte) string {
type Cell [17]byte
func compareCell(l, r Cell) int {
return bytes.Compare(l[:],r[:])
return bytes.Compare(l[:], r[:])
}
func readCell(val []byte) (res Cell) {