Skip to content

Commit

Permalink
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
Browse files Browse the repository at this point in the history
…te.sh
  • Loading branch information
nicktobey committed Jan 6, 2025
1 parent b51f167 commit eea16a4
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 14 deletions.
2 changes: 1 addition & 1 deletion go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ require (
github.com/dolthub/go-mysql-server v0.19.1-0.20241231201953-4af32d139747
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
github.com/dolthub/swiss v0.1.0
github.com/esote/minmaxheap v1.0.0
github.com/goccy/go-json v0.10.2
github.com/google/btree v1.1.2
github.com/google/go-github/v57 v57.0.0
Expand Down Expand Up @@ -110,7 +111,6 @@ require (
github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 // indirect
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect
github.com/dolthub/maphash v0.0.0-20221220182448-74e1e1ea1577 // indirect
github.com/esote/minmaxheap v1.0.0 // indirect
github.com/go-fonts/liberation v0.2.0 // indirect
github.com/go-kit/kit v0.10.0 // indirect
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 // indirect
Expand Down
3 changes: 2 additions & 1 deletion go/libraries/doltcore/doltdb/durable/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ import (
"bytes"
"context"
"fmt"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
"io"
"strings"

"github.com/dolthub/go-mysql-server/sql/expression/function/vector"

"github.com/dolthub/dolt/go/libraries/doltcore/schema"
"github.com/dolthub/dolt/go/store/hash"
"github.com/dolthub/dolt/go/store/prolly"
Expand Down
1 change: 1 addition & 0 deletions go/libraries/doltcore/schema/encoding/serialization.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package encoding
import (
"context"
"fmt"

fb "github.com/dolthub/flatbuffers/v23/go"
"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
Expand Down
3 changes: 2 additions & 1 deletion go/libraries/doltcore/schema/index_coll.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ package schema

import (
"fmt"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
"sort"
"strings"

"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
)

type IndexCollection interface {
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/index/dolt_index.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import (
"context"
"errors"
"fmt"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
"strings"
"sync/atomic"

"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/go-mysql-server/sql/expression"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
"github.com/dolthub/go-mysql-server/sql/fulltext"
sqltypes "github.com/dolthub/go-mysql-server/sql/types"

Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/tables.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"context"
"errors"
"fmt"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
"io"
"math"
"os"
Expand All @@ -31,6 +30,7 @@ import (

"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/go-mysql-server/sql/expression"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
"github.com/dolthub/go-mysql-server/sql/fulltext"
sqltypes "github.com/dolthub/go-mysql-server/sql/types"

Expand Down
7 changes: 4 additions & 3 deletions go/store/prolly/proximity_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@ package prolly

import (
"context"
"github.com/dolthub/dolt/go/store/pool"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
"io"
"iter"

"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"

"github.com/dolthub/dolt/go/store/hash"
"github.com/dolthub/dolt/go/store/pool"
"github.com/dolthub/dolt/go/store/prolly/message"
"github.com/dolthub/dolt/go/store/prolly/tree"
"github.com/dolthub/dolt/go/store/val"
"github.com/dolthub/go-mysql-server/sql"
)

// ProximityMap wraps a tree.ProximityMap but operates on typed Tuples instead of raw bytestrings.
Expand Down
6 changes: 4 additions & 2 deletions go/store/prolly/proximity_mutable_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ package prolly
import (
"context"
"fmt"

"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"

"github.com/dolthub/dolt/go/gen/fb/serial"
"github.com/dolthub/dolt/go/store/hash"
"github.com/dolthub/dolt/go/store/prolly/message"
"github.com/dolthub/dolt/go/store/prolly/tree"
"github.com/dolthub/dolt/go/store/skip"
"github.com/dolthub/dolt/go/store/val"
"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
)

type ProximityMutableMap = GenericMutableMap[ProximityMap, tree.ProximityMap[val.Tuple, val.Tuple, val.TupleDesc]]
Expand Down
4 changes: 3 additions & 1 deletion go/store/prolly/shim/shim.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ package shim
import (
"context"
"fmt"

"github.com/dolthub/go-mysql-server/sql/expression/function/vector"

"github.com/dolthub/dolt/go/gen/fb/serial"
"github.com/dolthub/dolt/go/libraries/doltcore/schema"
"github.com/dolthub/dolt/go/store/prolly"
"github.com/dolthub/dolt/go/store/prolly/tree"
"github.com/dolthub/dolt/go/store/types"
"github.com/dolthub/dolt/go/store/val"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
)

func NodeFromValue(v types.Value) (node tree.Node, fileId string, err error) {
Expand Down
7 changes: 4 additions & 3 deletions go/store/prolly/tree/proximity_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ package tree
import (
"container/heap"
"context"
"github.com/dolthub/dolt/go/store/skip"
"math"

"github.com/dolthub/go-mysql-server/sql"
"github.com/dolthub/go-mysql-server/sql/expression/function/vector"
"math"
"github.com/esote/minmaxheap"

"github.com/dolthub/dolt/go/store/hash"
"github.com/esote/minmaxheap"
"github.com/dolthub/dolt/go/store/skip"
)

type KeyValueDistanceFn[K, V ~[]byte] func(key K, value V, distance float64) error
Expand Down

0 comments on commit eea16a4

Please sign in to comment.