Merge branch 'main' into james/lazy

James Cor · James Cor · commit 0c43006ba8d8 · 2024-12-31T14:33:36.000-08:00
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20241220202600-b18f18d0cde7
+	github.com/dolthub/vitess v0.0.0-20241231200706-18992bb25fdc
 	github.com/go-kit/kit v0.10.0
 	github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d
 	github.com/gocraft/dbr/v2 v2.7.2
diff --git a/go.sum b/go.sum
@@ -60,6 +60,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/vitess v0.0.0-20241220202600-b18f18d0cde7 h1:w130WLeARGGNYWmhGPugsHXzJEelKKimt3kTWg6/Puk=
 github.com/dolthub/vitess v0.0.0-20241220202600-b18f18d0cde7/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
+github.com/dolthub/vitess v0.0.0-20241231200706-18992bb25fdc h1:3FuwEDwyue/JuHdnwGSbQhE9xKAFM+k1y3uXi58h7Gk=
+github.com/dolthub/vitess v0.0.0-20241231200706-18992bb25fdc/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
diff --git a/server/extension.go b/server/extension.go
@@ -35,9 +35,9 @@ func Intercept(h Interceptor) {
 func WithChain() Option {
 	return func(e *sqle.Engine, sm *SessionManager, handler mysql.Handler) {
 		f := DefaultProtocolListenerFunc
-		DefaultProtocolListenerFunc = func(cfg mysql.ListenerConfig) (ProtocolListener, error) {
+		DefaultProtocolListenerFunc = func(cfg mysql.ListenerConfig, sel ServerEventListener) (ProtocolListener, error) {
 			cfg.Handler = buildChain(cfg.Handler)
-			return f(cfg)
+			return f(cfg, sel)
 		}
 	}
 }
diff --git a/server/server.go b/server/server.go
@@ -37,13 +37,13 @@ type ProtocolListener interface {
 }
 
 // ProtocolListenerFunc returns a ProtocolListener based on the configuration it was given.
-type ProtocolListenerFunc func(cfg mysql.ListenerConfig) (ProtocolListener, error)
+type ProtocolListenerFunc func(cfg mysql.ListenerConfig, sel ServerEventListener) (ProtocolListener, error)
 
 // DefaultProtocolListenerFunc is the protocol listener, which defaults to Vitess' protocol listener. Changing
 // this function will change the protocol listener used when creating all servers. If multiple servers are needed
 // with different protocols, then create each server after changing this function. Servers retain the protocol that
 // they were created with.
-var DefaultProtocolListenerFunc ProtocolListenerFunc = func(cfg mysql.ListenerConfig) (ProtocolListener, error) {
+var DefaultProtocolListenerFunc ProtocolListenerFunc = func(cfg mysql.ListenerConfig, sel ServerEventListener) (ProtocolListener, error) {
 	return mysql.NewListenerWithConfig(cfg)
 }
 
@@ -75,7 +75,7 @@ func NewServer(cfg Config, e *sqle.Engine, sb SessionBuilder, listener ServerEve
 		sel:               listener,
 	}
 	//handler = NewHandler_(e, sm, cfg.ConnReadTimeout, cfg.DisableClientMultiStatements, cfg.MaxLoggedQueryLen, cfg.EncodeLoggedQuery, listener)
-	return newServerFromHandler(cfg, e, sm, handler)
+	return newServerFromHandler(cfg, e, sm, handler, listener)
 }
 
 // HandlerWrapper provides a way for clients to wrap the mysql.Handler used by the server with a custom implementation
@@ -113,7 +113,7 @@ func NewServerWithHandler(
 		return nil, err
 	}
 
-	return newServerFromHandler(cfg, e, sm, handler)
+	return newServerFromHandler(cfg, e, sm, handler, listener)
 }
 
 func portInUse(hostPort string) bool {
@@ -126,7 +126,7 @@ func portInUse(hostPort string) bool {
 	return false
 }
 
-func newServerFromHandler(cfg Config, e *sqle.Engine, sm *SessionManager, handler mysql.Handler) (*Server, error) {
+func newServerFromHandler(cfg Config, e *sqle.Engine, sm *SessionManager, handler mysql.Handler, sel ServerEventListener) (*Server, error) {
 	for _, option := range cfg.Options {
 		option(e, sm, handler)
 	}
@@ -169,7 +169,7 @@ func newServerFromHandler(cfg Config, e *sqle.Engine, sm *SessionManager, handle
 		ConnReadBufferSize:       mysql.DefaultConnBufferSize,
 		AllowClearTextWithoutTLS: cfg.AllowClearTextWithoutTLS,
 	}
-	protocolListener, err := DefaultProtocolListenerFunc(listenerCfg)
+	protocolListener, err := DefaultProtocolListenerFunc(listenerCfg, sel)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ func Intercept(h Interceptor) {`
`35`	`35`	`func WithChain() Option {`
`36`	`36`	`return func(e sqle.Engine, sm SessionManager, handler mysql.Handler) {`
`37`	`37`	`f := DefaultProtocolListenerFunc`
`38`		`- DefaultProtocolListenerFunc = func(cfg mysql.ListenerConfig) (ProtocolListener, error) {`
	`38`	`+ DefaultProtocolListenerFunc = func(cfg mysql.ListenerConfig, sel ServerEventListener) (ProtocolListener, error) {`
`39`	`39`	`cfg.Handler = buildChain(cfg.Handler)`
`40`		`- return f(cfg)`
	`40`	`+ return f(cfg, sel)`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,13 @@ type ProtocolListener interface {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// ProtocolListenerFunc returns a ProtocolListener based on the configuration it was given.`
`40`		`-type ProtocolListenerFunc func(cfg mysql.ListenerConfig) (ProtocolListener, error)`
	`40`	`+type ProtocolListenerFunc func(cfg mysql.ListenerConfig, sel ServerEventListener) (ProtocolListener, error)`
`41`	`41`
`42`	`42`	`// DefaultProtocolListenerFunc is the protocol listener, which defaults to Vitess' protocol listener. Changing`
`43`	`43`	`// this function will change the protocol listener used when creating all servers. If multiple servers are needed`
`44`	`44`	`// with different protocols, then create each server after changing this function. Servers retain the protocol that`
`45`	`45`	`// they were created with.`
`46`		`-var DefaultProtocolListenerFunc ProtocolListenerFunc = func(cfg mysql.ListenerConfig) (ProtocolListener, error) {`
	`46`	`+var DefaultProtocolListenerFunc ProtocolListenerFunc = func(cfg mysql.ListenerConfig, sel ServerEventListener) (ProtocolListener, error) {`
`47`	`47`	`return mysql.NewListenerWithConfig(cfg)`
`48`	`48`	`}`
`49`	`49`
`@@ -75,7 +75,7 @@ func NewServer(cfg Config, e *sqle.Engine, sb SessionBuilder, listener ServerEve`
`75`	`75`	`sel: listener,`
`76`	`76`	`}`
`77`	`77`	`//handler = NewHandler_(e, sm, cfg.ConnReadTimeout, cfg.DisableClientMultiStatements, cfg.MaxLoggedQueryLen, cfg.EncodeLoggedQuery, listener)`
`78`		`- return newServerFromHandler(cfg, e, sm, handler)`
	`78`	`+ return newServerFromHandler(cfg, e, sm, handler, listener)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`// HandlerWrapper provides a way for clients to wrap the mysql.Handler used by the server with a custom implementation`
`@@ -113,7 +113,7 @@ func NewServerWithHandler(`
`113`	`113`	`return nil, err`
`114`	`114`	`}`
`115`	`115`
`116`		`- return newServerFromHandler(cfg, e, sm, handler)`
	`116`	`+ return newServerFromHandler(cfg, e, sm, handler, listener)`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`func portInUse(hostPort string) bool {`
`@@ -126,7 +126,7 @@ func portInUse(hostPort string) bool {`
`126`	`126`	`return false`
`127`	`127`	`}`
`128`	`128`
`129`		`-func newServerFromHandler(cfg Config, e sqle.Engine, sm SessionManager, handler mysql.Handler) (*Server, error) {`
	`129`	`+func newServerFromHandler(cfg Config, e sqle.Engine, sm SessionManager, handler mysql.Handler, sel ServerEventListener) (*Server, error) {`
`130`	`130`	`for _, option := range cfg.Options {`
`131`	`131`	`option(e, sm, handler)`
`132`	`132`	`}`
`@@ -169,7 +169,7 @@ func newServerFromHandler(cfg Config, e sqle.Engine, sm SessionManager, handle`
`169`	`169`	`ConnReadBufferSize: mysql.DefaultConnBufferSize,`
`170`	`170`	`AllowClearTextWithoutTLS: cfg.AllowClearTextWithoutTLS,`
`171`	`171`	`}`
`172`		`- protocolListener, err := DefaultProtocolListenerFunc(listenerCfg)`
	`172`	`+ protocolListener, err := DefaultProtocolListenerFunc(listenerCfg, sel)`
`173`	`173`	`if err != nil {`
`174`	`174`	`return nil, err`
`175`	`175`	`}`