mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-14 11:29:06 -05:00
Code Issues Packages Projects Releases 165 Wiki Activity

merge with main

Browse Source
This commit is contained in:
James Cor
2024-02-08 16:40:37 -08:00
parent 21411db1ee c3a8ac2b53
commit 8d0499d035
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/go.mod
+2 -2
View File
@@ -15,7 +15,7 @@ require (
github.com/dolthub/fslock v0.0.3
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
github.com/dolthub/vitess v0.0.0-20240207220624-0c2d2128fb7b
github.com/dolthub/vitess v0.0.0-20240207121055-c057d2347007
github.com/dustin/go-humanize v1.0.1
github.com/fatih/color v1.13.0
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
@@ -57,7 +57,7 @@ require (
github.com/cespare/xxhash v1.1.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.17.1-0.20240208092050-bbad031437c9
github.com/dolthub/go-mysql-server v0.17.1-0.20240208021948-8c7762d0d825
github.com/dolthub/swiss v0.1.0
github.com/goccy/go-json v0.10.2
github.com/google/go-github/v57 v57.0.0
go/go.sum
+4 -4
View File
@@ -183,8 +183,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-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y=
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
github.com/dolthub/go-mysql-server v0.17.1-0.20240208092050-bbad031437c9 h1:symT8nt9Oxf0FkpUFaEV9+M9ywWvZcI1mWNHwz8Bi10=
github.com/dolthub/go-mysql-server v0.17.1-0.20240208092050-bbad031437c9/go.mod h1:mTI9ftDXUsfPREJW+U6OINfw+wzU7fyH3HGc2caW2rg=
github.com/dolthub/go-mysql-server v0.17.1-0.20240208021948-8c7762d0d825 h1:uVLs1DxzXXbi7sS2f48EoZ/CRoUmYsHlKU1C5QuIvM4=
github.com/dolthub/go-mysql-server v0.17.1-0.20240208021948-8c7762d0d825/go.mod h1:ANK0a6tyjrZ2cOzDJT3nFsDp80xksI4UfeijFlvnjwE=
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
github.com/dolthub/jsonpath v0.0.2-0.20240201003050-392940944c15 h1:sfTETOpsrNJPDn2KydiCtDgVu6Xopq8k3JP8PjFT22s=
@@ -195,8 +195,8 @@ github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9X
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
github.com/dolthub/swiss v0.1.0 h1:EaGQct3AqeP/MjASHLiH6i4TAmgbG/c4rA6a1bzCOPc=
github.com/dolthub/swiss v0.1.0/go.mod h1:BeucyB08Vb1G9tumVN3Vp/pyY4AMUnr9p7Rz7wJ7kAQ=
github.com/dolthub/vitess v0.0.0-20240207220624-0c2d2128fb7b h1:7Sxjtwd7Cm2ilQDFvyXPfCkNkJMK//2GBGb3aM9ht7k=
github.com/dolthub/vitess v0.0.0-20240207220624-0c2d2128fb7b/go.mod h1:IwjNXSQPymrja5pVqmfnYdcy7Uv7eNJNBPK/MEh9OOw=
github.com/dolthub/vitess v0.0.0-20240207121055-c057d2347007 h1:MvFoe0FnHhxQLyp4Ldw0HRj1yu83YErbtbr7XxhaIFk=
github.com/dolthub/vitess v0.0.0-20240207121055-c057d2347007/go.mod h1:IwjNXSQPymrja5pVqmfnYdcy7Uv7eNJNBPK/MEh9OOw=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
go/libraries/doltcore/sqle/dprocedures/init.go
+4 -4
View File
@@ -48,10 +48,10 @@ var DoltProcedures = []sql.ExternalStoredProcedureDetails{
{Name: "dolt_tag", Schema: int64Schema("status"), Function: doltTag},
{Name: "dolt_verify_constraints", Schema: int64Schema("violations"), Function: doltVerifyConstraints},
{Name: "dolt_stats_drop", Schema: doltMergeSchema, Function: statsFunc(statsDrop)},
{Name: "dolt_stats_restart", Schema: doltMergeSchema, Function: statsFunc(statsRestart)},
{Name: "dolt_stats_stop", Schema: doltMergeSchema, Function: statsFunc(statsStop)},
{Name: "dolt_stats_status", Schema: doltMergeSchema, Function: statsFunc(statsStatus)},
{Name: "dolt_stats_drop", Schema: statsFuncSchema, Function: statsFunc(statsDrop)},
{Name: "dolt_stats_restart", Schema: statsFuncSchema, Function: statsFunc(statsRestart)},
{Name: "dolt_stats_stop", Schema: statsFuncSchema, Function: statsFunc(statsStop)},
{Name: "dolt_stats_status", Schema: statsFuncSchema, Function: statsFunc(statsStatus)},
}
// stringSchema returns a non-nullable schema with all columns as LONGTEXT.
go/libraries/doltcore/sqle/dprocedures/stats_funcs.go
+9
View File
@@ -19,12 +19,21 @@ import (
"strings"
"github.com/dolthub/go-mysql-server/sql"
gmstypes "github.com/dolthub/go-mysql-server/sql/types"
"github.com/dolthub/dolt/go/libraries/doltcore/env"
"github.com/dolthub/dolt/go/libraries/doltcore/ref"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
)
var statsFuncSchema = []*sql.Column{
{
Name: "message",
Type: gmstypes.LongText,
Nullable: true,
},
}
func statsFunc(fn func(ctx *sql.Context) (interface{}, error)) func(ctx *sql.Context, args ...string) (sql.RowIter, error) {
return func(ctx *sql.Context, args ...string) (sql.RowIter, error) {
res, err := fn(ctx)
go/libraries/doltcore/sqle/stats/stats_provider.go
+4
View File
@@ -297,10 +297,14 @@ func (s *dbStats) setLatestHash(tableName string, h hash.Hash) {
}
func (s *dbStats) getCurrentMap() prolly.Map {
s.mu.Lock()
defer s.mu.Unlock()
return s.currentMap
}
func (s *dbStats) setCurrentMap(m prolly.Map) {
s.mu.Lock()
defer s.mu.Unlock()
s.currentMap = m
}