Skip to content

Commit

Permalink
bump
Browse files Browse the repository at this point in the history
  • Loading branch information
James Cor committed Dec 26, 2024
2 parents 9a6088a + b3417c9 commit 88d3700
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 46 deletions.
2 changes: 1 addition & 1 deletion go/cmd/dolt/doltversion/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
package doltversion

const (
Version = "1.45.0"
Version = "1.45.1"
)
3 changes: 1 addition & 2 deletions go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,10 @@ require (
github.com/Shopify/toxiproxy/v2 v2.5.0
github.com/aliyun/aliyun-oss-go-sdk v2.2.5+incompatible
github.com/cenkalti/backoff/v4 v4.1.3
github.com/cespare/xxhash v1.1.0
github.com/cespare/xxhash/v2 v2.2.0
github.com/creasty/defaults v1.6.0
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
github.com/dolthub/go-mysql-server v0.19.1-0.20241226233955-486f6d572014
github.com/dolthub/go-mysql-server v0.19.1-0.20241226234256-8cbd98876e74
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
github.com/dolthub/swiss v0.1.0
github.com/goccy/go-json v0.10.2
Expand Down
10 changes: 2 additions & 8 deletions go/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q
github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc=
Expand Down Expand Up @@ -138,8 +136,6 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
Expand Down Expand Up @@ -183,8 +179,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM=
github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
github.com/dolthub/go-mysql-server v0.19.1-0.20241226233955-486f6d572014 h1:uwQSM9lupapzeZsXLAvRsSb/L65558iovs1gFG9jyMU=
github.com/dolthub/go-mysql-server v0.19.1-0.20241226233955-486f6d572014/go.mod h1:ToNOAVZAJ6iQBpigxYZo3q8JZDRxpI2/VRrtUoZeehI=
github.com/dolthub/go-mysql-server v0.19.1-0.20241226234256-8cbd98876e74 h1:UxpdOeEspDxZnQ5JMafA/5yhrmNNJaovSC4EW6P+YWc=
github.com/dolthub/go-mysql-server v0.19.1-0.20241226234256-8cbd98876e74/go.mod h1:ToNOAVZAJ6iQBpigxYZo3q8JZDRxpI2/VRrtUoZeehI=
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=
Expand Down Expand Up @@ -641,8 +637,6 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k
github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg=
github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
Expand Down
45 changes: 24 additions & 21 deletions go/libraries/doltcore/sqle/enginetest/dolt_engine_tests.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ func RunSystemTableIndexesTests(t *testing.T, harness DoltEnginetestHarness) {
}

for _, stt := range SystemTableIndexTests {
harness = harness.NewHarness(t).WithParallelism(2)
harness = harness.NewHarness(t).WithParallelism(1)
defer harness.Close()
harness.SkipSetupCommit()
e := mustNewEngine(t, harness)
Expand All @@ -1422,27 +1422,30 @@ func RunSystemTableIndexesTests(t *testing.T, harness DoltEnginetestHarness) {
enginetest.RunQueryWithContext(t, e, harness, ctx, q)
}

for i, c := range []string{"inner", "lookup", "hash", "merge"} {
e.EngineAnalyzer().Coster = biasedCosters[i]
for _, tt := range stt.queries {
if tt.query == "select count(*) from dolt_blame_xy" && c == "inner" {
// todo we either need join hints to work inside the blame view
// and force the window relation to be primary, or we need the
// blame view's timestamp columns to be specific enough to not
// overlap during testing.
t.Skip("the blame table is unstable as secondary table in join with exchange node")
}
t.Run(fmt.Sprintf("%s(%s): %s", stt.name, c, tt.query), func(t *testing.T) {
if tt.skip {
t.Skip()
}

ctx = ctx.WithQuery(tt.query)
if tt.exp != nil {
enginetest.TestQueryWithContext(t, ctx, e, harness, tt.query, tt.exp, nil, nil, nil)
costers := []string{"inner", "lookup", "hash", "merge"}
for i, c := range costers {
t.Run(c, func(t *testing.T) {
e.EngineAnalyzer().Coster = biasedCosters[i]
for _, tt := range stt.queries {
if tt.query == "select count(*) from dolt_blame_xy" && c == "inner" {
// todo we either need join hints to work inside the blame view
// and force the window relation to be primary, or we need the
// blame view's timestamp columns to be specific enough to not
// overlap during testing.
t.Skip("the blame table is unstable as secondary table in join with exchange node")
}
})
}
t.Run(fmt.Sprintf("%s(%s): %s", stt.name, c, tt.query), func(t *testing.T) {
if tt.skip {
t.Skip()
}

ctx = ctx.WithQuery(tt.query)
if tt.exp != nil {
enginetest.TestQueryWithContext(t, ctx, e, harness, tt.query, tt.exp, nil, nil, nil)
}
})
}
})
}
}
}
Expand Down
1 change: 1 addition & 0 deletions go/libraries/doltcore/sqle/enginetest/dolt_harness.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ type DoltEnginetestHarness interface {
WithSkippedQueries(skipped []string) DoltEnginetestHarness

// WithParallelism returns a copy of the harness with parallelism set to the given number of threads
// Deprecated: parallelism currently no-ops
WithParallelism(parallelism int) DoltEnginetestHarness

// WithConfigureStats returns a copy of the harness with the given configureStats value
Expand Down
8 changes: 8 additions & 0 deletions go/libraries/doltcore/sqle/enginetest/dolt_queries_diff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6240,6 +6240,14 @@ var SystemTableIndexTests = []systabScript{
ORDER BY cm.date, cm.message asc`,
exp: []sql.UntypedSqlRow{{5}},
},
{
query: "select count(*) /*+ JOIN_ORDER(a,b) */ from dolt_diff_xy a join xy b on x = to_x",
exp: []sql.Row{{45}},
},
{
query: "select count(*) /*+ JOIN_ORDER(b,a) */ from dolt_diff_xy a join xy b on x = to_x",
exp: []sql.Row{{45}},
},
},
},
{
Expand Down
25 changes: 13 additions & 12 deletions go/libraries/doltcore/sqle/index/dolt_index.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,19 @@ func DoltDiffIndexesFromTable(ctx context.Context, db, tbl string, t *doltdb.Tab

// to_ columns
toIndex := doltIndex{
id: "PRIMARY",
tblName: doltdb.DoltDiffTablePrefix + tbl,
dbName: db,
columns: toCols,
indexSch: sch,
tableSch: sch,
unique: true,
comment: "",
vrw: t.ValueReadWriter(),
ns: t.NodeStore(),
keyBld: keyBld,
order: sql.IndexOrderAsc,
id: "PRIMARY",
tblName: doltdb.DoltDiffTablePrefix + tbl,
dbName: db,
columns: toCols,
indexSch: sch,
tableSch: sch,
unique: true,
comment: "",
vrw: t.ValueReadWriter(),
ns: t.NodeStore(),
keyBld: keyBld,
// only ordered on PK within a diff partition
order: sql.IndexOrderNone,
constrainedToLookupExpression: false,
}

Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/kvexec/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ func getMergeKv(ctx *sql.Context, n sql.Node) (mergeState, error) {
//case *dtables.DiffTable:
// TODO: add interface to include system tables
default:
return ms, nil
return ms, fmt.Errorf("non-standard indexed table not supported")
}

if idx.Format() != types.Format_DOLT {
Expand Down
2 changes: 1 addition & 1 deletion go/performance/import_benchmarker/testdef.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"testing"
"time"

"github.com/cespare/xxhash"
"github.com/cespare/xxhash/v2"
"github.com/creasty/defaults"
sql2 "github.com/dolthub/go-mysql-server/sql"
gmstypes "github.com/dolthub/go-mysql-server/sql/types"
Expand Down

0 comments on commit 88d3700

Please sign in to comment.