Skip to content

Log query execution times in the sqlstore #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
r-vdp merged 1 commit into from
Dec 18, 2025
Merged

Log query execution times in the sqlstore #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"log/slog"
"os"
"runtime/debug"
"time"

"github.com/Arkiv-Network/query-api/query"
"github.com/Arkiv-Network/query-api/sqlstore"
Expand Down Expand Up @@ -49,12 +48,6 @@ func (api *arkivAPI) Query(
}()

// TODO log query plan
startTime := time.Now()
defer func() {
elapsed := time.Since(startTime)
queryDuration.Observe(elapsed.Seconds())
api.log.Info("query execution time", "seconds", elapsed.Seconds(), "query", req)
}()

response, err := api.store.QueryEntities(ctx, req, op, "postgresql")

Expand Down
29 changes: 20 additions & 9 deletions sqlstore/sqlstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ func (s *SQLStore) QueryEntities(

err = s.QueryEntitiesInternalIterator(
ctx,
evaluatedQuery.Query,
evaluatedQuery.Args,
req,
evaluatedQuery,
queryOptions,
func(entity *query.EntityData, cursor *query.Cursor) error {

Expand Down Expand Up @@ -180,24 +180,35 @@ func (s *SQLStore) QueryEntities(

func (s *SQLStore) QueryEntitiesInternalIterator(
ctx context.Context,
queryStr string,
args []any,
originalQuery string,
evaluatedQuery *query.SelectQuery,
options *query.QueryOptions,
iterator func(*query.EntityData, *query.Cursor) error,
) error {
s.log.Info("Executing query", "query", queryStr, "sqlQuery", queryStr, "args", args)
s.log.Info(
"Executing query",
"query", originalQuery,
"sqlQuery", evaluatedQuery.Query,
"args", evaluatedQuery.Args,
)

startTime := time.Now()
defer func() {
elapsed := time.Since(startTime)
s.log.Info("query execution time", "seconds", elapsed.Seconds(), "query", originalQuery)
}()

rows, err := s.db.QueryContext(ctx, queryStr, args...)
rows, err := s.db.QueryContext(ctx, evaluatedQuery.Query, evaluatedQuery.Args...)
if err != nil {
return fmt.Errorf("failed to get entities for query: %s: %w", queryStr, err)
return fmt.Errorf("failed to get entities for query: %s: %w", originalQuery, err)
}
defer rows.Close()

for rows.Next() {

err := rows.Err()
if err != nil {
return fmt.Errorf("failed to get entities for query: %s: %w", queryStr, err)
return fmt.Errorf("failed to get entities for query: %s: %w", originalQuery, err)
}

var (
Expand Down Expand Up @@ -254,7 +265,7 @@ func (s *SQLStore) QueryEntitiesInternalIterator(
}

if err := rows.Scan(dest...); err != nil {
return fmt.Errorf("failed to get entities for query: %s: %w", queryStr, err)
return fmt.Errorf("failed to get entities for query: %s: %w", originalQuery, err)
}

var keyHash *common.Hash
Expand Down