set timeout sys vars, updated tests

Author: angelamayxie

enginetest/server_engine_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"math"
 	"net"
+	"os"
 	"testing"
 
 	"github.com/dolthub/vitess/go/mysql"
@@ -376,7 +377,10 @@ func TestServerPreparedStatements(t *testing.T) {
 	}
 }
 
-func TestServerQueries(t *testing.T) {
+func TestServerVariables(t *testing.T) {
+	hostname, herr := os.Hostname()
+	require.NoError(t, herr)
+
 	port, perr := findEmptyPort()
 	require.NoError(t, perr)
 
@@ -388,22 +392,24 @@ func TestServerQueries(t *testing.T) {
 
 	tests := []serverScriptTest{
 		{
-			name:  "test that config variables are properly set",
+			name:  "test that config system variables are properly set",
 			setup: []string{},
 			assertions: []serverScriptTestAssertion{
 				{
-					query: "select @@hostname, @@port",
-					//query:  "select @@hostname, @@port, @@max_connections",
+					query:  "select @@hostname, @@port, @@max_connections, @@net_read_timeout, @@net_write_timeout",
 					isExec: false,
 					expectedRows: []any{
-						sql.Row{"macbook.local", port},
+						sql.Row{hostname, port, 1, 1, 1},
 					},
 					checkRows: func(t *testing.T, rows *gosql.Rows, expectedRows []any) (bool, error) {
 						var resHostname string
 						var resPort int
+						var resMaxConnections int
+						var resNetReadTimeout int
+						var resNetWriteTimeout int
 						var rowNum int
 						for rows.Next() {
-							if err := rows.Scan(&resHostname, &resPort); err != nil {
+							if err := rows.Scan(&resHostname, &resPort, &resMaxConnections, &resNetReadTimeout, &resNetWriteTimeout); err != nil {
 								return false, err
 							}
 							if rowNum >= len(expectedRows) {

server/server.go

@@ -18,7 +18,6 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"os"
 	"strconv"
 	"time"
 
@@ -120,19 +119,7 @@ func portInUse(hostPort string) bool {
 	return false
 }
 
-func getHostname() (string, error) {
-	hostname, err := os.Hostname()
-	if err != nil {
-		return "", err
-	}
-	return hostname, nil
-}
-
 func updateSystemVariables(cfg mysql.ListenerConfig) error {
-	hostname, err := getHostname()
-	if err != nil {
-		return err
-	}
 	_, port, err := net.SplitHostPort(cfg.Listener.Addr().String())
 	if err != nil {
 		return err
@@ -143,10 +130,10 @@ func updateSystemVariables(cfg mysql.ListenerConfig) error {
 	}
 	// TODO: add the rest of the config variables
 	err = sql.SystemVariables.AssignValues(map[string]interface{}{
-		"port":     portInt,
-		"hostname": hostname,
-		// TODO: this causes an error because max_connections is 0?
-		//"max_connections": cfg.MaxConns,
+		"port":              portInt,
+		"max_connections":   cfg.MaxConns,
+		"net_read_timeout":  cfg.ConnReadTimeout.Seconds(),
+		"net_write_timeout": cfg.ConnWriteTimeout.Seconds(),
 	})
 	if err != nil {
 		return err
@@ -155,14 +142,18 @@ func updateSystemVariables(cfg mysql.ListenerConfig) error {
 }
 
 func newServerFromHandler(cfg Config, e *sqle.Engine, sm *SessionManager, handler mysql.Handler, sel ServerEventListener) (*Server, error) {
-	if cfg.ConnReadTimeout < 0 {
-		cfg.ConnReadTimeout = 0
-	}
-	if cfg.ConnWriteTimeout < 0 {
-		cfg.ConnWriteTimeout = 0
-	}
-	if cfg.MaxConnections < 0 {
-		cfg.MaxConnections = 0
+	oneSecond := time.Duration(1) * time.Second
+	if cfg.ConnReadTimeout < oneSecond {
+		// TODO set to MySQL default value
+		cfg.ConnReadTimeout = oneSecond
+	}
+	if cfg.ConnWriteTimeout < oneSecond {
+		// TODO set to MySQL default value
+		cfg.ConnWriteTimeout = oneSecond
+	}
+	if cfg.MaxConnections < 1 {
+		// TODO set to MySQL default value
+		cfg.MaxConnections = 1
 	}
 
 	for _, opt := range cfg.Options {

server/server_config.go

@@ -109,14 +109,14 @@ func (c Config) NewConfig() (Config, error) {
 		if !ok {
 			return Config{}, sql.ErrUnknownSystemVariable.New("net_write_timeout")
 		}
-		c.ConnWriteTimeout = time.Duration(timeout) * time.Millisecond
+		c.ConnWriteTimeout = time.Duration(timeout) * time.Second
 	}
 	if _, val, ok := sql.SystemVariables.GetGlobal("net_read_timeout"); ok {
 		timeout, ok := val.(int64)
 		if !ok {
 			return Config{}, sql.ErrUnknownSystemVariable.New("net_read_timeout")
 		}
-		c.ConnReadTimeout = time.Duration(timeout) * time.Millisecond
+		c.ConnReadTimeout = time.Duration(timeout) * time.Second
 	}
 	return c, nil
 }