Skip to content

Commit

Permalink
Export more helpers from raftlogs
Browse files Browse the repository at this point in the history
  • Loading branch information
tinyzimmer committed Jul 21, 2023
1 parent 8dd900f commit 7fe707e
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions pkg/meshdb/raftlogs/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 7fe707e

Please sign in to comment.