From 7fe707ea7039176a8ddf1b7c468f17cd305892ce Mon Sep 17 00:00:00 2001 From: Avi Zimmerman Date: Fri, 21 Jul 2023 15:31:08 +0300 Subject: [PATCH] Export more helpers from raftlogs --- pkg/meshdb/raftlogs/apply.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/meshdb/raftlogs/apply.go b/pkg/meshdb/raftlogs/apply.go index b74632618..efa73b2bb 100644 --- a/pkg/meshdb/raftlogs/apply.go +++ b/pkg/meshdb/raftlogs/apply.go @@ -15,6 +15,8 @@ limitations under the License. */ // Package raftlogs provides facilities for applying raft logs to a database. +// It also contains helpers for executing queries and statements provided as +// protobuf messages. package raftlogs import ( @@ -90,7 +92,7 @@ func ApplyQuery(ctx context.Context, db *sql.DB, query *v1.SQLQuery) (*v1.RaftAp }() querier = tx } - result, err := queryWithQuerier(ctx, querier, query) + result, err := QueryWithQuerier(ctx, querier, query) if err != nil { return nil, fmt.Errorf("query: %w", err) } @@ -126,7 +128,7 @@ func ApplyExecute(ctx context.Context, db *sql.DB, exec *v1.SQLExec) (*v1.RaftAp }() querier = tx } - result, err := execWithQuerier(ctx, querier, exec) + result, err := ExecWithQuerier(ctx, querier, exec) if err != nil { return nil, fmt.Errorf("execute: %w", err) } @@ -140,7 +142,8 @@ func ApplyExecute(ctx context.Context, db *sql.DB, exec *v1.SQLExec) (*v1.RaftAp }, nil } -func queryWithQuerier(ctx context.Context, q models.DBTX, query *v1.SQLQuery) (*v1.SQLQueryResult, error) { +// QueryWithQuerier queries with the given querier. +func QueryWithQuerier(ctx context.Context, q models.DBTX, query *v1.SQLQuery) (*v1.SQLQueryResult, error) { params, err := SQLParametersToNamedArgs(query.GetStatement().GetParameters()) if err != nil { return nil, fmt.Errorf("convert parameters: %w", err) @@ -190,7 +193,8 @@ func queryWithQuerier(ctx context.Context, q models.DBTX, query *v1.SQLQuery) (* }, nil } -func execWithQuerier(ctx context.Context, q models.DBTX, exec *v1.SQLExec) (*v1.SQLExecResult, error) { +// ExecWithQuerier executes a statement with the given querier. +func ExecWithQuerier(ctx context.Context, q models.DBTX, exec *v1.SQLExec) (*v1.SQLExecResult, error) { params, err := SQLParametersToNamedArgs(exec.GetStatement().GetParameters()) if err != nil { return nil, fmt.Errorf("convert parameters: %w", err)