align struct fields to reduce memory usage

driver/conn.go

@@ -23,13 +23,13 @@ import (
 
 // Conn is a connection to a database.
 type Conn struct {
-	dsn      string
-	options  *Options
-	dbConn   *dbConn
 	session  sql.Session
 	contexts ContextBuilder
+	options  *Options
+	dbConn   *dbConn
 	indexes  *sql.IndexRegistry
 	views    *sql.ViewRegistry
+	dsn      string
 }
 
 // DSN returns the driver connection string.

driver/driver.go

@@ -82,12 +82,11 @@ type ProviderWithSessionBuilder interface {
 // A Driver exposes an engine as a stdlib SQL driver.
 type Driver struct {
 	provider Provider
-	options  *Options
 	sessions SessionBuilder
 	contexts ContextBuilder
-
-	mu  sync.Mutex
-	dbs map[string]*dbConn
+	options  *Options
+	dbs      map[string]*dbConn
+	mu       sync.Mutex
 }
 
 // New returns a driver using the specified provider.
@@ -223,9 +222,9 @@ func (c *dbConn) close() error {
 type Connector struct {
 	driver     *Driver
 	options    *Options
+	dbConn     *dbConn
 	serverName string
 	dsn        string
-	dbConn     *dbConn
 }
 
 // Driver returns the driver.

driver/rows.go

@@ -26,10 +26,10 @@ import (
 
 // Rows is an iterator over an executed query's results.
 type Rows struct {
+	rows    sql.RowIter
 	options *Options
 	ctx     *sql.Context
 	cols    sql.Schema
-	rows    sql.RowIter
 }
 
 // Columns returns the names of the columns. The number of

driver/stmt.go

@@ -117,5 +117,10 @@ func (s *Stmt) query(ctx context.Context, bindings map[string]sqlparser.Expr) (d
 		return nil, err
 	}
 
-	return &Rows{s.conn.options, qctx, cols, rows}, nil
+	return &Rows{
+		options: s.conn.options,
+		ctx:     qctx,
+		cols:    cols,
+		rows:    rows,
+	}, nil
 }

engine.go

@@ -53,16 +53,16 @@ func init() {
 type Config struct {
 	// VersionPostfix to display with the `VERSION()` UDF.
 	VersionPostfix string
+	// TemporaryUsers adds any users that should be included when the engine is created. By default, authentication is
+	// disabled, and including any users here will enable authentication. All users in this list will have full access.
+	// This field is only temporary, and will be removed as development on users and authentication continues.
+	TemporaryUsers []TemporaryUser
 	// IsReadOnly sets the engine to disallow modification queries.
 	IsReadOnly     bool
 	IsServerLocked bool
 	// IncludeRootAccount adds the root account (with no password) to the list of accounts, and also enables
 	// authentication.
 	IncludeRootAccount bool
-	// TemporaryUsers adds any users that should be included when the engine is created. By default, authentication is
-	// disabled, and including any users here will enable authentication. All users in this list will have full access.
-	// This field is only temporary, and will be removed as development on users and authentication continues.
-	TemporaryUsers []TemporaryUser
 }
 
 // TemporaryUser is a user that will be added to the engine. This is for temporary use while the remaining features
@@ -136,18 +136,18 @@ func (p *PreparedDataCache) UncacheStmt(sessId uint32, query string) {
 
 // Engine is a SQL engine.
 type Engine struct {
+	Parser            sql.Parser
+	ProcessList       sql.ProcessList
 	Analyzer          *analyzer.Analyzer
 	LS                *sql.LockSubsystem
-	ProcessList       sql.ProcessList
 	MemoryManager     *sql.MemoryManager
 	BackgroundThreads *sql.BackgroundThreads
-	ReadOnly          atomic.Bool
-	IsServerLocked    bool
 	PreparedDataCache *PreparedDataCache
 	mu                *sync.Mutex
-	Version           sql.AnalyzerVersion
 	EventScheduler    *eventscheduler.EventScheduler
-	Parser            sql.Parser
+	ReadOnly          atomic.Bool
+	IsServerLocked    bool
+	Version           sql.AnalyzerVersion
 }
 
 var _ sql.StatementRunner = (*Engine)(nil)

enginetest/queries/check_scripts.go

@@ -540,16 +540,36 @@ var ChecksOnUpdateScriptTests = []ScriptTest{
 		},
 		Assertions: []ScriptTestAssertion{
 			{
-				Query:    "UPDATE sales JOIN (SELECT year_built FROM sales) AS t ON sales.year_built = t.year_built SET sales.year_built = 1901;",
-				Expected: []sql.Row{{types.OkResult{1, 0, plan.UpdateInfo{1, 1, 0}}}},
+				Query: "UPDATE sales JOIN (SELECT year_built FROM sales) AS t ON sales.year_built = t.year_built SET sales.year_built = 1901;",
+				Expected: []sql.Row{
+					{
+						types.OkResult{
+							RowsAffected: 1,
+							Info: plan.UpdateInfo{
+								Matched: 1,
+								Updated: 1,
+							},
+						},
+					},
+				},
 			},
 			{
 				Query:    "select * from sales;",
 				Expected: []sql.Row{{1901}},
 			},
 			{
-				Query:    "UPDATE sales as s1 JOIN (SELECT year_built FROM sales) AS t SET S1.year_built = 1902;",
-				Expected: []sql.Row{{types.OkResult{1, 0, plan.UpdateInfo{1, 1, 0}}}},
+				Query: "UPDATE sales as s1 JOIN (SELECT year_built FROM sales) AS t SET S1.year_built = 1902;",
+				Expected: []sql.Row{
+					{
+						types.OkResult{
+							RowsAffected: 1,
+							Info: plan.UpdateInfo{
+								Matched: 1,
+								Updated: 1,
+							},
+						},
+					},
+				},
 			},
 			{
 				Query:    "select * from sales;",
@@ -599,8 +619,18 @@ var ChecksOnUpdateScriptTests = []ScriptTest{
 				Expected: []sql.Row{{"WA"}},
 			},
 			{
-				Query:    "UPDATE sales JOIN locations SET sales.year_built = 2000, locations.state = 'CA';",
-				Expected: []sql.Row{{types.OkResult{2, 0, plan.UpdateInfo{2, 2, 0}}}},
+				Query: "UPDATE sales JOIN locations SET sales.year_built = 2000, locations.state = 'CA';",
+				Expected: []sql.Row{
+					{
+						types.OkResult{
+							RowsAffected: 2,
+							Info: plan.UpdateInfo{
+								Matched: 2,
+								Updated: 2,
+							},
+						},
+					},
+				},
 			},
 			{
 				Query:    "select * from sales;",

eventscheduler/enabled_event.go

@@ -26,11 +26,11 @@ import (
 
 // enabledEvent is used for storing a list of events that are enabled in EventScheduler.
 type enabledEvent struct {
-	edb             sql.EventDatabase
-	event           sql.EventDefinition
 	nextExecutionAt time.Time
+	edb             sql.EventDatabase
 	username        string
 	address         string
+	event           sql.EventDefinition
 }
 
 var _ fmt.Stringer = (*enabledEvent)(nil)

eventscheduler/event_executor.go

@@ -30,15 +30,15 @@ import (
 // to update the enabled events list in the eventExecutor. It also handles updating the event
 // metadata in the database or dropping it from the database after its execution.
 type eventExecutor struct {
+	catalog             sql.Catalog
 	bThreads            *sql.BackgroundThreads
 	list                *enabledEventsList
 	runningEventsStatus *runningEventsStatus
 	ctxGetterFunc       func() (*sql.Context, error)
 	queryRunFunc        func(ctx *sql.Context, dbName, query, username, address string) error
-	stop                atomic.Bool
-	catalog             sql.Catalog
 	tokenTracker        *tokenTracker
 	period              int
+	stop                atomic.Bool
 }
 
 // newEventExecutor returns a new eventExecutor instance with an empty enabled events list.

eventscheduler/event_scheduler.go

@@ -50,9 +50,9 @@ var _ sql.EventScheduler = (*EventScheduler)(nil)
 
 // EventScheduler is responsible for SQL events execution.
 type EventScheduler struct {
-	status        SchedulerStatus
 	executor      *eventExecutor
 	ctxGetterFunc func() (*sql.Context, error)
+	status        SchedulerStatus
 }
 
 // InitEventScheduler is called at the start of the server. This function returns EventScheduler object

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20250820171420-f2b78f56ce9f
 	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-20250814204310-c749d213f235
+	github.com/dolthub/vitess v0.0.0-20250828002016-b8fc8e714bf8
 	github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d
 	github.com/gocraft/dbr/v2 v2.7.2
 	github.com/google/uuid v1.3.0

go.sum

@@ -12,20 +12,14 @@ github.com/denisenkom/go-mssqldb v0.10.0 h1:QykgLZBorFE95+gO3u9esLd0BmbvpWp0/waN
 github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY=
-github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g=
-github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
 github.com/dolthub/go-icu-regex v0.0.0-20250820171420-f2b78f56ce9f h1:oSA8CptGeCEdTdD9LFtv8x4juDfdaLKsx1eocyaj1bE=
 github.com/dolthub/go-icu-regex v0.0.0-20250820171420-f2b78f56ce9f/go.mod h1:kpsRG+a196Y69zsAFL0RkQICII9a571lcaxhvQnmrdY=
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ=
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
-github.com/dolthub/vitess v0.0.0-20250730174048-497aebb8cea7 h1:l+mWO0xoh4eG1J9gMS87opL6N6WGAQitF36R/Lg4bWs=
-github.com/dolthub/vitess v0.0.0-20250730174048-497aebb8cea7/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
-github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751 h1:BBQKyvyODewdQxS+ICklMn1d/fFj2pVlkmMN1QFY4ms=
-github.com/dolthub/vitess v0.0.0-20250813175212-45844169a751/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
-github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235 h1:uXrK+xn8rCwz/8jWDKaDyqZG1HbZI9F4V4HJ7zXFPMY=
-github.com/dolthub/vitess v0.0.0-20250814204310-c749d213f235/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
+github.com/dolthub/vitess v0.0.0-20250828002016-b8fc8e714bf8 h1:RJwo+L0E5NDcYsipjwWau0I85SlPPhtx9xN2UMYtfd4=
+github.com/dolthub/vitess v0.0.0-20250828002016-b8fc8e714bf8/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -81,8 +75,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tetratelabs/wazero v1.8.2 h1:yIgLR/b2bN31bjxwXHD8a3d+BogigR952csSDdLYEv4=
-github.com/tetratelabs/wazero v1.8.2/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
 github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
 github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
 go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY=

internal/sockstate/netstat.go

@@ -77,18 +77,18 @@ func (s *sockAddr) String() string {
 
 // sockTabEntry type represents each line of the /proc/net/tcp
 type sockTabEntry struct {
-	Ino        string
 	LocalAddr  *sockAddr
 	RemoteAddr *sockAddr
-	State      skState
-	UID        uint32
 	Process    *process
+	Ino        string
+	UID        uint32
+	State      skState
 }
 
 // process holds the PID and process name to which each socket belongs
 type process struct {
-	pid  int
 	name string
+	pid  int
 }
 
 func (p *process) String() string {

internal/sockstate/netstat_linux.go

@@ -100,7 +100,7 @@ func (p *procFd) iterFdDir() {
 				}
 				z := bytes.SplitN(buf[:n], []byte(" "), 3)
 				name := getProcName(z[1])
-				p.p = &process{p.pid, name}
+				p.p = &process{name: name, pid: p.pid}
 			}
 			sk.Process = p.p
 		}

memory/database.go

@@ -55,15 +55,15 @@ var _ sql.SchemaValidator = (*BaseDatabase)(nil)
 
 // BaseDatabase is an in-memory database that can't store views, only for testing the engine
 type BaseDatabase struct {
-	name              string
 	tables            map[string]MemTable
 	fkColl            *ForeignKeyCollection
+	tablesMu          *sync.RWMutex
+	name              string
 	triggers          []sql.TriggerDefinition
 	storedProcedures  []sql.StoredProcedureDetails
 	events            []sql.EventDefinition
-	primaryKeyIndexes bool
 	collation         sql.CollationID
-	tablesMu          *sync.RWMutex
+	primaryKeyIndexes bool
 }
 
 var _ MemoryDatabase = (*Database)(nil)

memory/index.go

@@ -28,21 +28,23 @@ import (
 const CommentPreventingIndexBuilding = "__FOR TESTING: I cannot be built__"
 
 type Index struct {
-	DB         string // required for engine tests with driver
-	DriverName string // required for engine tests with driver
-	Tbl        *Table // required for engine tests with driver
-	TableName  string
-	Exprs      []sql.Expression
-	Name       string
-	Unique     bool
-	Spatial    bool
-	Fulltext   bool
 	// If SupportedVectorFunction is non-nil, this index can be used to optimize ORDER BY
 	// expressions on this type of distance function.
 	SupportedVectorFunction vector.DistanceType
-	CommentStr              string
-	PrefixLens              []uint16
+
+	Tbl        *Table // required for engine tests with driver
+	DriverName string // required for engine tests with driver
+	DB         string // required for engine tests with driver
+	TableName  string
+	Name       string
+	CommentStr string
+
+	Exprs      []sql.Expression
+	PrefixLens []uint16
 	fulltextInfo
+	Unique   bool
+	Spatial  bool
+	Fulltext bool
 }
 
 type fulltextInfo struct {

memory/index_driver.go

@@ -24,8 +24,8 @@ const IndexDriverId = "MemoryIndexDriver"
 // create or delete indexes, but will use the index types defined in this package to alter how queries are executed,
 // retrieving values from the indexes rather than from the tables directly.
 type TestIndexDriver struct {
-	db      string
 	indexes map[string][]sql.DriverIndex
+	db      string
 }
 
 // NewIndexDriver returns a new index driver for database and the indexes given, keyed by the table name.

memory/provider.go

@@ -17,12 +17,12 @@ var _ sql.ExternalStoredProcedureProvider = (*DbProvider)(nil)
 // DbProvider is a provider for in-memory databases
 type DbProvider struct {
 	dbs                       map[string]sql.Database
+	tableFunctions            map[string]sql.TableFunction
+	externalProcedureRegistry sql.ExternalStoredProcedureRegistry
+	mu                        *sync.RWMutex
 	history                   bool
 	readOnly                  bool
 	nativeIndexes             bool
-	mu                        *sync.RWMutex
-	tableFunctions            map[string]sql.TableFunction
-	externalProcedureRegistry sql.ExternalStoredProcedureRegistry
 }
 
 type ProviderOption func(*DbProvider)

memory/required_lookup_table.go

@@ -18,8 +18,8 @@ var _ sql.IndexRequired = RequiredLookupTable{}
 
 // RequiredLookupTable is a table that will error if not executed as an index lookup
 type RequiredLookupTable struct {
-	indexOk bool
 	IntSequenceTable
+	indexOk bool
 }
 
 func (s RequiredLookupTable) RequiredPredicates() []string {