persistent session interface

auth/audit_test.go

@@ -190,7 +190,7 @@ func TestAuditLog(t *testing.T) {
 	m["err"] = err
 	require.Equal(m, e.Data)
 
-	s := sql.NewSession("server", sql.Client{Address: "client", User: "user"}, id)
+	s := sql.NewBaseSessionWithClientServer("server", sql.Client{Address: "client", User: "user"}, id)
 	ctx := sql.NewContext(context.TODO(),
 		sql.WithSession(s),
 		sql.WithPid(pid),

auth/common_test.go

@@ -156,7 +156,7 @@ func testAuthorization(
 		t.Run(fmt.Sprintf("%s-%s", c.user, c.query), func(t *testing.T) {
 			req := require.New(t)
 
-			session := sql.NewSession("localhost", sql.Client{Address: "client", User: c.user}, uint32(i))
+			session := sql.NewBaseSessionWithClientServer("localhost", sql.Client{Address: "client", User: c.user}, uint32(i))
 			ctx := sql.NewContext(context.TODO(),
 				sql.WithSession(session),
 				sql.WithPid(uint64(i))).WithCurrentDB("test")

driver/session.go

@@ -15,7 +15,7 @@ type SessionBuilder interface {
 // DefaultSessionBuilder creates basic SQL sessions.
 type DefaultSessionBuilder struct{}
 
-// NewSession calls sql.NewSession.
+// NewSession calls sql.NewBaseSessionWithClientServer.
 func (DefaultSessionBuilder) NewSession(ctx context.Context, id uint32, conn *Connector) (sql.Session, error) {
-	return sql.NewSession(conn.Server(), sql.Client{Address: fmt.Sprintf("#%d", id)}, id), nil
+	return sql.NewBaseSessionWithClientServer(conn.Server(), sql.Client{Address: fmt.Sprintf("#%d", id)}, id), nil
 }

enginetest/engine_test.go

@@ -187,7 +187,7 @@ func TestShowProcessList(t *testing.T) {
 	addr := "127.0.0.1:34567"
 
 	p := sqle.NewProcessList()
-	sess := sql.NewSession("0.0.0.0:3306", sql.Client{Address: addr, User: "foo"}, 1)
+	sess := sql.NewBaseSessionWithClientServer("0.0.0.0:3306", sql.Client{Address: addr, User: "foo"}, 1)
 	ctx := sql.NewContext(context.Background(), sql.WithPid(1), sql.WithSession(sess), sql.WithProcessList(p))
 
 	ctx, err := p.AddProcess(ctx, "SELECT foo")

enginetest/enginetests.go

@@ -3520,6 +3520,57 @@ func TestColumnDefaults(t *testing.T, harness Harness) {
 	})
 }
 
+func TestPersist(t *testing.T, harness Harness, newPersistableSess func(ctx *sql.Context) sql.PersistableSession) {
+	q := []struct {
+		Name            string
+		Query           string
+		Expected        []sql.Row
+		ExpectedGlobal  interface{}
+		ExpectedPersist interface{}
+	}{
+		{
+			Query:           "SET PERSIST max_connections = 1000;",
+			Expected:        []sql.Row{{}},
+			ExpectedGlobal:  int64(1000),
+			ExpectedPersist: int64(1000),
+		}, {
+			Query:           "SET @@PERSIST.max_connections = 1000;",
+			Expected:        []sql.Row{{}},
+			ExpectedGlobal:  int64(1000),
+			ExpectedPersist: int64(1000),
+		}, {
+			Query:           "SET PERSIST_ONLY max_connections = 1000;",
+			Expected:        []sql.Row{{}},
+			ExpectedGlobal:  int64(151),
+			ExpectedPersist: int64(1000),
+		},
+	}
+
+	e := NewEngine(t, harness)
+	ctx := NewContext(harness)
+
+	for _, tt := range q {
+		t.Run(tt.Name, func(t *testing.T) {
+			sql.InitSystemVariables()
+			ctx.Session = newPersistableSess(ctx)
+
+			TestQueryWithContext(t, ctx, e, tt.Query, tt.Expected, nil, nil)
+
+			if tt.ExpectedGlobal != nil {
+				_, res, _ := sql.SystemVariables.GetGlobal("max_connections")
+				require.Equal(t, tt.ExpectedGlobal, res)
+			}
+
+			if tt.ExpectedGlobal != nil {
+				res, err := ctx.Session.(sql.PersistableSession).GetPersistedValue("max_connections")
+				require.NoError(t, err)
+				assert.Equal(t,
+					tt.ExpectedPersist, res)
+			}
+		})
+	}
+}
+
 var pid uint64
 
 func NewContext(harness Harness) *sql.Context {
@@ -3570,8 +3621,8 @@ func NewSession(harness Harness) *sql.Context {
 
 // NewBaseSession returns a new BaseSession compatible with these tests. Most tests will work with any session
 // implementation, but for full compatibility use a session based on this one.
-func NewBaseSession() sql.Session {
-	return sql.NewSession("address", sql.Client{Address: "client", User: "user"}, 1)
+func NewBaseSession() *sql.BaseSession {
+	return sql.NewBaseSessionWithClientServer("address", sql.Client{Address: "client", User: "user"}, 1)
 }
 
 func NewContextWithEngine(harness Harness, engine *sqle.Engine) *sql.Context {

enginetest/memory_engine_test.go

@@ -481,6 +481,15 @@ func TestAddDropPks(t *testing.T) {
 	enginetest.TestAddDropPks(t, enginetest.NewDefaultMemoryHarness())
 }
 
+func TestPersist(t *testing.T) {
+	newSess := func(ctx *sql.Context) sql.PersistableSession {
+		persistedGlobals := memory.GlobalsMap{}
+		persistedSess := memory.NewInMemoryPersistedSession(ctx.Session, persistedGlobals)
+		return persistedSess
+	}
+	enginetest.TestPersist(t, enginetest.NewDefaultMemoryHarness(), newSess)
+}
+
 func unmergableIndexDriver(dbs []sql.Database) sql.IndexDriver {
 	return memory.NewIndexDriver("mydb", map[string][]sql.DriverIndex{
 		"mytable": {

go.mod

@@ -1,35 +1,36 @@
 module github.com/dolthub/go-mysql-server
 
 require (
-	github.com/VividCortex/gohistogram v1.0.0 // indirect
 	github.com/cespare/xxhash v1.1.0
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
 	github.com/dolthub/vitess v0.0.0-20211013185428-a8845fb919c1
-	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
-	github.com/go-kit/kit v0.9.0
+	github.com/go-kit/kit v0.10.0
 	github.com/go-sql-driver/mysql v1.6.0
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/google/go-cmp v0.3.0 // indirect
+	github.com/golang/glog v0.0.0-20210429001901-424d2337a529
 	github.com/google/uuid v1.2.0
-	github.com/hashicorp/golang-lru v0.5.3
-	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/lestrrat-go/strftime v1.0.1
-	github.com/mitchellh/hashstructure v1.0.0
+	github.com/hashicorp/golang-lru v0.5.4
+	github.com/kr/text v0.2.0 // indirect
+	github.com/lestrrat-go/strftime v1.0.4
+	github.com/mitchellh/hashstructure v1.1.0
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852
-	github.com/opentracing/opentracing-go v1.1.0
+	github.com/opentracing/opentracing-go v1.2.0
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/sanity-io/litter v1.2.0
-	github.com/shopspring/decimal v0.0.0-20191130220710-360f2bc03045
-	github.com/sirupsen/logrus v1.4.2
+	github.com/shopspring/decimal v1.2.0
+	github.com/sirupsen/logrus v1.8.1
 	github.com/src-d/go-oniguruma v1.1.0
 	github.com/stretchr/testify v1.7.0
-	github.com/tebeka/strftime v0.1.4 // indirect
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
-	google.golang.org/grpc v1.27.0 // indirect
+	golang.org/x/net v0.0.0-20210505214959-0714010a04ed // indirect
+	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+	golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 // indirect
+	golang.org/x/tools v0.1.0 // indirect
+	google.golang.org/genproto v0.0.0-20210506142907-4a47615972c2 // indirect
+	google.golang.org/grpc v1.37.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 	gopkg.in/src-d/go-errors.v1 v1.0.0
+	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
 )
 
 replace github.com/oliveagle/jsonpath => github.com/dolthub/jsonpath v0.0.0-20210609232853-d49537a30474