Refactor engine and catalog packages.

Author: efritz

cmd/repl/main.go

@@ -9,7 +9,8 @@ import (
 
 	"github.com/chzyer/readline"
 	"github.com/efritz/gostgres/internal/execution/engine"
-	"github.com/efritz/gostgres/internal/execution/engine/serialization"
+	"github.com/efritz/gostgres/internal/execution/protocol"
+	"github.com/efritz/gostgres/internal/execution/serialization"
 	"github.com/efritz/gostgres/internal/sample"
 	"github.com/efritz/gostgres/internal/syntax/parsing"
 )
@@ -109,7 +110,10 @@ func handleQuery(engine *engine.Engine, opts options, input string) (err error)
 		}
 	}()
 
-	rows, err := engine.Query(input, opts.debug)
+	rows, err := engine.QueryRows(protocol.Request{
+		Query: input,
+		Debug: opts.debug,
+	})
 	if err != nil {
 		return err
 	}

internal/catalog/functions/defaults.go

@@ -33,7 +33,7 @@ func nextval(ctx impls.Context, args []any) (any, error) {
 		return nil, fmt.Errorf("nextval() takes one argument of type string")
 	}
 
-	sequence, ok := ctx.GetSequence(name)
+	sequence, ok := ctx.Sequences.Get(name)
 	if !ok {
 		return nil, fmt.Errorf("sequence %s does not exist", name)
 	}
@@ -54,7 +54,7 @@ func setval(ctx impls.Context, args []any) (any, error) {
 		return nil, fmt.Errorf("setval() takes two arguments of type string, biginteger")
 	}
 
-	sequence, ok := ctx.GetSequence(name)
+	sequence, ok := ctx.Sequences.Get(name)
 	if !ok {
 		return nil, fmt.Errorf("sequence %s does not exist", name)
 	}
@@ -71,7 +71,7 @@ func currval(ctx impls.Context, args []any) (any, error) {
 		return nil, fmt.Errorf("currval() takes one argument of type string")
 	}
 
-	sequence, ok := ctx.GetSequence(name)
+	sequence, ok := ctx.Sequences.Get(name)
 	if !ok {
 		return nil, fmt.Errorf("sequence %s does not exist", name)
 	}

internal/execution/engine/engine.go

@@ -6,7 +6,7 @@ import (
 	"github.com/efritz/gostgres/internal/catalog"
 	"github.com/efritz/gostgres/internal/catalog/aggregates"
 	"github.com/efritz/gostgres/internal/catalog/functions"
-	"github.com/efritz/gostgres/internal/execution/engine/protocol"
+	"github.com/efritz/gostgres/internal/execution/protocol"
 	"github.com/efritz/gostgres/internal/shared/impls"
 	"github.com/efritz/gostgres/internal/shared/rows"
 	"github.com/efritz/gostgres/internal/syntax/lexing"
@@ -43,10 +43,11 @@ func NewEngine(
 	}
 }
 
-func (e *Engine) Query(input string, debug bool) (rows.Rows, error) {
-	query, err := parsing.Parse(lexing.Lex(input), e.tables)
+func (e *Engine) Query(request protocol.Request, responseWriter protocol.ResponseWriter) {
+	query, err := parsing.Parse(lexing.Lex(request.Query), e.tables)
 	if err != nil {
-		return rows.Rows{}, fmt.Errorf("failed to parse query: %s", err)
+		responseWriter.Error(fmt.Errorf("failed to parse query: %s", err))
+		return
 	}
 
 	ctx := impls.NewContext(
@@ -55,16 +56,27 @@ func (e *Engine) Query(input string, debug bool) (rows.Rows, error) {
 		e.functions,
 		e.aggregates,
 	)
-	if debug {
+	if request.Debug {
 		ctx = ctx.WithDebug()
 	}
 
+	query.Execute(ctx, responseWriter)
+}
+
+func (e *Engine) QueryRows(request protocol.Request) (rows.Rows, error) {
 	collector := protocol.NewRowCollector()
-	query.Execute(ctx, collector)
+	e.Query(request, collector)
 	collectedRows, err := collector.Rows()
 	if err != nil {
-		return rows.Rows{}, fmt.Errorf("failed to execute query %q: %s", input, err)
+		return rows.Rows{}, fmt.Errorf("failed to execute query %q: %s", request.Query, err)
 	}
 
 	return collectedRows, nil
 }
+
+func (e *Engine) QueryError(request protocol.Request) error {
+	collector := protocol.NewRowCollector()
+	e.Query(request, collector)
+	_, err := collector.Rows()
+	return err
+}

internal/execution/expressions/aggregate.go

@@ -16,7 +16,7 @@ func AsAggregate(ctx impls.Context, e impls.Expression) impls.AggregateExpressio
 			return e
 		}
 
-		aggregate, ok := ctx.GetAggregate(f.name)
+		aggregate, ok := ctx.Aggregates.Get(f.name)
 		if !ok {
 			return e
 		}

internal/execution/expressions/function.go

@@ -75,7 +75,7 @@ func (e functionExpression) Map(f func(impls.Expression) impls.Expression) impls
 }
 
 func (e functionExpression) ValueFrom(ctx impls.Context, row rows.Row) (any, error) {
-	f, ok := ctx.GetFunction(e.name)
+	f, ok := ctx.Functions.Get(e.name)
 	if !ok {
 		return nil, fmt.Errorf("unknown function %s", e.name)
 	}

…nal/execution/engine/protocol/request.go internal/execution/protocol/request.gointernal/execution/engine/protocol/request.go renamed to internal/execution/protocol/request.go internal/execution/engine/protocol/request.go renamed to internal/execution/protocol/request.go

@@ -2,4 +2,5 @@ package protocol
 
 type Request struct {
 	Query string
+	Debug bool
 }

internal/execution/protocol/response.go

@@ -0,0 +1,11 @@
+package protocol
+
+import (
+	"github.com/efritz/gostgres/internal/shared/rows"
+)
+
+type ResponseWriter interface {
+	SendRow(row rows.Row)
+	Done()
+	Error(err error)
+}

…al/execution/engine/protocol/response.go …rnal/execution/protocol/row_collector.gointernal/execution/engine/protocol/response.go renamed to internal/execution/protocol/row_collector.go internal/execution/engine/protocol/response.go renamed to internal/execution/protocol/row_collector.go

@@ -6,12 +6,6 @@ import (
 	"github.com/efritz/gostgres/internal/shared/rows"
 )
 
-type ResponseWriter interface {
-	SendRow(row rows.Row)
-	Done()
-	Error(err error)
-}
-
 type rowCollector struct {
 	done bool
 	rows rows.Rows

internal/execution/queries/access/access.go

@@ -1,11 +1,11 @@
 package access
 
 import (
-	"github.com/efritz/gostgres/internal/execution/engine/serialization"
 	"github.com/efritz/gostgres/internal/execution/expressions"
 	"github.com/efritz/gostgres/internal/execution/queries"
 	"github.com/efritz/gostgres/internal/execution/queries/filter"
 	"github.com/efritz/gostgres/internal/execution/scan"
+	"github.com/efritz/gostgres/internal/execution/serialization"
 	"github.com/efritz/gostgres/internal/shared/fields"
 	"github.com/efritz/gostgres/internal/shared/impls"
 )

internal/execution/queries/access/strategy.go

@@ -2,9 +2,9 @@ package access
 
 import (
 	"github.com/efritz/gostgres/internal/catalog/table/indexes"
-	"github.com/efritz/gostgres/internal/execution/engine/serialization"
 	"github.com/efritz/gostgres/internal/execution/expressions"
 	"github.com/efritz/gostgres/internal/execution/scan"
+	"github.com/efritz/gostgres/internal/execution/serialization"
 	"github.com/efritz/gostgres/internal/shared/impls"
 )