split corrosion queries in a separate file, make subscription more consistent with queries

This commit is contained in:
Pavel Sviderski
2024-10-03 14:07:25 +10:00
parent 06a4001080
commit 518eae9bd2
2 changed files with 349 additions and 328 deletions
+22 -328
View File
@@ -125,322 +125,6 @@ func (rt *RetryRoundTripper) RoundTrip(req *http.Request) (*http.Response, error
return backoff.RetryWithData(roundTrip, boff)
}
type Statement struct {
Query string `json:"query"`
Params []any `json:"params"`
}
type ExecResponse struct {
Results []ExecResult `json:"results"`
Time float64 `json:"time"`
Version *uint `json:"version"`
}
type ExecResult struct {
RowsAffected uint `json:"rows_affected"`
Time float64 `json:"time"`
Error *string `json:"error"`
}
// ExecContext writes changes to the Corrosion database for propagation through the cluster. The args are for any
// placeholder parameters in the query. Corrosion does not sync schema changes made using this method. Use Corrosion's
// schema_files to create and update the cluster's database schema.
func (c *APIClient) ExecContext(ctx context.Context, query string, args ...any) (*ExecResult, error) {
statements := []Statement{
{
Query: query,
Params: args,
},
}
resp, err := c.ExecMultiContext(ctx, statements...)
if err != nil {
return nil, err
}
if len(resp.Results) == 0 {
return nil, fmt.Errorf("no results: %+v", resp)
}
return &resp.Results[0], nil
}
// ExecMultiContext writes changes to the Corrosion database for propagation through the cluster.
// Unlike ExecContext, this method allows multiple statements to be executed in a single transaction.
func (c *APIClient) ExecMultiContext(ctx context.Context, statements ...Statement) (*ExecResponse, error) {
body, err := json.Marshal(statements)
if err != nil {
return nil, fmt.Errorf("marshal queries: %w", err)
}
transactionsURL := c.baseURL.JoinPath("/v1/transactions").String()
req, err := http.NewRequestWithContext(ctx, "POST", transactionsURL, bytes.NewReader(body))
if err != nil {
return nil, fmt.Errorf("create request: %w", err)
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Accept", "application/json")
resp, err := c.client.Do(req)
if err != nil {
return nil, fmt.Errorf("send request: %w", err)
}
defer resp.Body.Close()
var execResp ExecResponse
if resp.StatusCode == http.StatusOK {
if err = json.NewDecoder(resp.Body).Decode(&execResp); err != nil {
return nil, fmt.Errorf("decode response: %w", err)
}
// The response may still contain DB errors even if the status code is OK. Return them along with the response.
var errs []error
for _, result := range execResp.Results {
if result.Error != nil {
errs = append(errs, errors.New(*result.Error))
}
}
return &execResp, errors.Join(errs...)
} else if resp.StatusCode == http.StatusInternalServerError {
// If the response is an Internal Server Error, the response body may contain the error encoded as ExecResponse.
respBody, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("read response body: %w", err)
}
if err = json.Unmarshal(respBody, &execResp); err != nil {
return nil, fmt.Errorf("internal server error: %s", respBody)
}
if len(execResp.Results) > 0 && execResp.Results[0].Error != nil {
return nil, errors.New(*execResp.Results[0].Error)
}
return nil, fmt.Errorf("internal server error: %s", respBody)
}
respBody, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("read response body: %w", err)
}
return nil, fmt.Errorf("unexpected status code %d: %s", resp.StatusCode, respBody)
}
type QueryEvent struct {
Columns []string `json:"columns"`
Row *RowEvent `json:"row"`
EOQ *EndOfQuery `json:"eoq"`
Change *ChangeEvent `json:"change"`
// Error is a server-side error that occurred during query execution. It's considered fatal for the client
// as it cannot be recovered from server-side.
Error *string `json:"error"`
}
type EndOfQuery struct {
Time float64 `json:"time"`
ChangeID *uint64 `json:"change_id"`
}
type RowEvent struct {
RowID uint64
Values []json.RawMessage
}
func (re *RowEvent) UnmarshalJSON(data []byte) error {
var raw []json.RawMessage
if err := json.Unmarshal(data, &raw); err != nil {
return fmt.Errorf("invalid row event: %w", err)
}
if len(raw) != 2 {
return fmt.Errorf("invalid row event: expected an array of 2 elements")
}
if err := json.Unmarshal(raw[0], &re.RowID); err != nil {
return fmt.Errorf("invalid row event: %w", err)
}
if err := json.Unmarshal(raw[1], &re.Values); err != nil {
return fmt.Errorf("invalid row event: %w", err)
}
return nil
}
func (re *RowEvent) MarshalJSON() ([]byte, error) {
return json.Marshal([]any{re.RowID, re.Values})
}
// QueryContext executes a query that returns rows, typically a SELECT.
// The args are for any placeholder parameters in the query.
func (c *APIClient) QueryContext(ctx context.Context, query string, args ...any) (*Rows, error) {
statement := Statement{
Query: query,
Params: args,
}
body, err := json.Marshal(statement)
if err != nil {
return nil, fmt.Errorf("marshal query: %w", err)
}
queriesURL := c.baseURL.JoinPath("/v1/queries").String()
req, err := http.NewRequestWithContext(ctx, "POST", queriesURL, bytes.NewReader(body))
if err != nil {
return nil, fmt.Errorf("create request: %w", err)
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Accept", "application/json")
resp, err := c.client.Do(req)
if err != nil {
return nil, fmt.Errorf("send request: %w", err)
}
if resp.StatusCode != http.StatusOK {
respBody, err := io.ReadAll(resp.Body)
resp.Body.Close()
if err != nil {
return nil, fmt.Errorf("read response body: %w", err)
}
return nil, fmt.Errorf("unexpected status code %d: %s", resp.StatusCode, respBody)
}
rows, err := newRows(ctx, resp.Body, true)
if err != nil {
resp.Body.Close()
return nil, fmt.Errorf("parse query response: %w", err)
}
return rows, nil
}
// Rows is the result of a query. Its cursor starts before the first row of the result set.
// Use [Rows.Next] to advance from row to row.
type Rows struct {
ctx context.Context
body io.ReadCloser
decoder *json.Decoder
eoq *EndOfQuery
closeOnEOQ bool
columns []string
row RowEvent
err error
}
func newRows(ctx context.Context, body io.ReadCloser, closeOnEOQ bool) (*Rows, error) {
select {
case <-ctx.Done():
return nil, ctx.Err()
default:
}
decoder := json.NewDecoder(body)
var e QueryEvent
if err := decoder.Decode(&e); err != nil {
return nil, fmt.Errorf("decode query event: %w", err)
}
if e.Columns == nil {
return nil, fmt.Errorf("expected columns event, got: %+v", e)
}
return &Rows{
ctx: ctx,
body: body,
decoder: decoder,
closeOnEOQ: closeOnEOQ,
columns: e.Columns,
}, nil
}
// Columns returns the column names.
func (rs *Rows) Columns() []string {
return rs.columns
}
// Next prepares the next result row for reading with the [Rows.Scan] method. It returns true on success, or false
// if there is no next result row or an error happened while preparing it. [Rows.Err] should be consulted to distinguish
// between the two cases.
//
// Every call to [Rows.Scan], even the first one, must be preceded by a call to [Rows.Next].
func (rs *Rows) Next() bool {
select {
case <-rs.ctx.Done():
rs.err = rs.ctx.Err()
_ = rs.Close()
return false
default:
}
var e QueryEvent
if err := rs.decoder.Decode(&e); err != nil {
rs.err = fmt.Errorf("decode query event: %w", err)
_ = rs.Close()
return false
}
// Server-side query error.
if e.Error != nil {
rs.err = fmt.Errorf("query error: %s", *e.Error)
_ = rs.Close()
return false
}
if e.Row != nil {
if len(e.Row.Values) != len(rs.columns) {
rs.err = fmt.Errorf("expected %d column values, got %d", len(rs.columns), len(e.Row.Values))
_ = rs.Close()
return false
}
rs.row = *e.Row
return true
}
if e.EOQ != nil {
rs.eoq = e.EOQ
// Rows could be used as part of a subscription, so don't close the body if so.
if rs.closeOnEOQ {
_ = rs.Close()
}
return false
}
rs.err = fmt.Errorf("expected row or eof event, got: %+v", e)
_ = rs.Close()
return false
}
// Err returns the error, if any, that was encountered during iteration.
// Err may be called after an explicit or implicit [Rows.Close].
func (rs *Rows) Err() error {
return rs.err
}
// Scan copies the columns in the current row into the values pointed at by dest.
// The number of values in dest must be the same as the number of columns in [Rows].
// Scan converts JSON-encoded column values to the provided Go types using [json.Unmarshal].
func (rs *Rows) Scan(dest ...any) error {
if rs.err != nil {
return rs.err
}
if len(dest) != len(rs.columns) {
return fmt.Errorf("expected %d values, got %d", len(rs.columns), len(dest))
}
for i, v := range rs.row.Values {
if err := json.Unmarshal(v, dest[i]); err != nil {
return fmt.Errorf("unmarshal column value #%d: %w", i, err)
}
}
return nil
}
// Time returns the time taken to execute the query in seconds. It's only available after all rows have been consumed.
// It doesn't include the time to send the query, receive the response, or iterate over the rows.
func (rs *Rows) Time() (float64, error) {
if rs.eoq == nil {
if rs.Err() != nil {
return 0, fmt.Errorf("time is not available: %w", rs.Err())
}
return 0, errors.New("time is not available until all rows are consumed")
}
return rs.eoq.Time, nil
}
// Close closes the [Rows], preventing further enumeration. If [Rows.Next] is called and returns false,
// the [Rows] are closed automatically and it will suffice to check the result of [Rows.Err].
// Close is idempotent and does not affect the result of [Rows.Err].
func (rs *Rows) Close() error {
return rs.body.Close()
}
// SubscribeContext creates a subscription to receive updates for a desired SQL query. If skipRows is false,
// Subscription.Rows must be consumed before Subscription.Changes can be called. If skipRows is true, Subscription.Rows
// will be nil.
@@ -569,11 +253,11 @@ func (ce *ChangeEvent) Scan(dest ...any) error {
// Subscription receives updates from the Corrosion database for a desired SQL query.
type Subscription struct {
ID string
Rows *Rows
ctx context.Context
cancel context.CancelFunc
ctx context.Context
cancel context.CancelFunc
id string
rows *Rows
body io.ReadCloser
decoder *json.Decoder
changes chan *ChangeEvent
@@ -589,8 +273,8 @@ func newSubscription(
decoder = json.NewDecoder(body)
}
return &Subscription{
ID: id,
Rows: rows,
id: id,
rows: rows,
ctx: ctx,
cancel: cancel,
body: body,
@@ -598,6 +282,17 @@ func newSubscription(
}
}
// ID returns the subscription ID.
func (s *Subscription) ID() string {
return s.id
}
// Rows returns the rows of the query or nil if skipRows was true when creating the subscription or if the subscription
// was created with [APIClient.ResubscribeContext].
func (s *Subscription) Rows() *Rows {
return s.rows
}
// Changes returns a channel that receives change events for the query. Changes are not available until all rows
// are consumed. The channel is closed when the context is done, or an error occurs while reading the changes,
// or when the subscription is closed explicitly. If it's closed due to an error, [Subscription.Err] will return
@@ -607,11 +302,11 @@ func (s *Subscription) Changes() (<-chan *ChangeEvent, error) {
return s.changes, nil
}
if s.Rows != nil {
if s.Rows.eoq == nil {
if s.rows != nil {
if s.rows.eoq == nil {
return nil, errors.New("changes are not available until all rows are consumed")
}
s.lastChangeID = *s.Rows.eoq.ChangeID
s.lastChangeID = *s.rows.eoq.ChangeID
}
s.changes = make(chan *ChangeEvent)
@@ -634,9 +329,8 @@ func (s *Subscription) Changes() (<-chan *ChangeEvent, error) {
var e QueryEvent
if err := s.decoder.Decode(&e); err != nil {
if s.ctx.Err() != nil {
s.err = s.ctx.Err()
} else {
// Do not report an error that occurred due to context cancellation.
if s.ctx.Err() == nil {
s.err = fmt.Errorf("decode query event: %w", err)
}
return
+327
View File
@@ -0,0 +1,327 @@
package corrosion
import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"io"
"net/http"
)
type Statement struct {
Query string `json:"query"`
Params []any `json:"params"`
}
type ExecResponse struct {
Results []ExecResult `json:"results"`
Time float64 `json:"time"`
Version *uint `json:"version"`
}
type ExecResult struct {
RowsAffected uint `json:"rows_affected"`
Time float64 `json:"time"`
Error *string `json:"error"`
}
// ExecContext writes changes to the Corrosion database for propagation through the cluster. The args are for any
// placeholder parameters in the query. Corrosion does not sync schema changes made using this method. Use Corrosion's
// schema_files to create and update the cluster's database schema.
func (c *APIClient) ExecContext(ctx context.Context, query string, args ...any) (*ExecResult, error) {
statements := []Statement{
{
Query: query,
Params: args,
},
}
resp, err := c.ExecMultiContext(ctx, statements...)
if err != nil {
return nil, err
}
if len(resp.Results) == 0 {
return nil, fmt.Errorf("no results: %+v", resp)
}
return &resp.Results[0], nil
}
// ExecMultiContext writes changes to the Corrosion database for propagation through the cluster.
// Unlike ExecContext, this method allows multiple statements to be executed in a single transaction.
func (c *APIClient) ExecMultiContext(ctx context.Context, statements ...Statement) (*ExecResponse, error) {
body, err := json.Marshal(statements)
if err != nil {
return nil, fmt.Errorf("marshal queries: %w", err)
}
transactionsURL := c.baseURL.JoinPath("/v1/transactions").String()
req, err := http.NewRequestWithContext(ctx, "POST", transactionsURL, bytes.NewReader(body))
if err != nil {
return nil, fmt.Errorf("create request: %w", err)
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Accept", "application/json")
resp, err := c.client.Do(req)
if err != nil {
return nil, fmt.Errorf("send request: %w", err)
}
defer resp.Body.Close()
var execResp ExecResponse
if resp.StatusCode == http.StatusOK {
if err = json.NewDecoder(resp.Body).Decode(&execResp); err != nil {
return nil, fmt.Errorf("decode response: %w", err)
}
// The response may still contain DB errors even if the status code is OK. Return them along with the response.
var errs []error
for _, result := range execResp.Results {
if result.Error != nil {
errs = append(errs, errors.New(*result.Error))
}
}
return &execResp, errors.Join(errs...)
} else if resp.StatusCode == http.StatusInternalServerError {
// If the response is an Internal Server Error, the response body may contain the error encoded as ExecResponse.
respBody, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("read response body: %w", err)
}
if err = json.Unmarshal(respBody, &execResp); err != nil {
return nil, fmt.Errorf("internal server error: %s", respBody)
}
if len(execResp.Results) > 0 && execResp.Results[0].Error != nil {
return nil, errors.New(*execResp.Results[0].Error)
}
return nil, fmt.Errorf("internal server error: %s", respBody)
}
respBody, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("read response body: %w", err)
}
return nil, fmt.Errorf("unexpected status code %d: %s", resp.StatusCode, respBody)
}
type QueryEvent struct {
Columns []string `json:"columns"`
Row *RowEvent `json:"row"`
EOQ *EndOfQuery `json:"eoq"`
Change *ChangeEvent `json:"change"`
// Error is a server-side error that occurred during query execution. It's considered fatal for the client
// as it cannot be recovered from server-side.
Error *string `json:"error"`
}
type EndOfQuery struct {
Time float64 `json:"time"`
ChangeID *uint64 `json:"change_id"`
}
type RowEvent struct {
RowID uint64
Values []json.RawMessage
}
func (re *RowEvent) UnmarshalJSON(data []byte) error {
var raw []json.RawMessage
if err := json.Unmarshal(data, &raw); err != nil {
return fmt.Errorf("invalid row event: %w", err)
}
if len(raw) != 2 {
return fmt.Errorf("invalid row event: expected an array of 2 elements")
}
if err := json.Unmarshal(raw[0], &re.RowID); err != nil {
return fmt.Errorf("invalid row event: %w", err)
}
if err := json.Unmarshal(raw[1], &re.Values); err != nil {
return fmt.Errorf("invalid row event: %w", err)
}
return nil
}
func (re *RowEvent) MarshalJSON() ([]byte, error) {
return json.Marshal([]any{re.RowID, re.Values})
}
// QueryContext executes a query that returns rows, typically a SELECT.
// The args are for any placeholder parameters in the query.
func (c *APIClient) QueryContext(ctx context.Context, query string, args ...any) (*Rows, error) {
statement := Statement{
Query: query,
Params: args,
}
body, err := json.Marshal(statement)
if err != nil {
return nil, fmt.Errorf("marshal query: %w", err)
}
queriesURL := c.baseURL.JoinPath("/v1/queries").String()
req, err := http.NewRequestWithContext(ctx, "POST", queriesURL, bytes.NewReader(body))
if err != nil {
return nil, fmt.Errorf("create request: %w", err)
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("Accept", "application/json")
resp, err := c.client.Do(req)
if err != nil {
return nil, fmt.Errorf("send request: %w", err)
}
if resp.StatusCode != http.StatusOK {
respBody, err := io.ReadAll(resp.Body)
resp.Body.Close()
if err != nil {
return nil, fmt.Errorf("read response body: %w", err)
}
return nil, fmt.Errorf("unexpected status code %d: %s", resp.StatusCode, respBody)
}
rows, err := newRows(ctx, resp.Body, true)
if err != nil {
resp.Body.Close()
return nil, fmt.Errorf("parse query response: %w", err)
}
return rows, nil
}
// Rows is the result of a query. Its cursor starts before the first row of the result set.
// Use [Rows.Next] to advance from row to row.
type Rows struct {
ctx context.Context
body io.ReadCloser
decoder *json.Decoder
eoq *EndOfQuery
closeOnEOQ bool
columns []string
row RowEvent
err error
}
func newRows(ctx context.Context, body io.ReadCloser, closeOnEOQ bool) (*Rows, error) {
select {
case <-ctx.Done():
return nil, ctx.Err()
default:
}
decoder := json.NewDecoder(body)
var e QueryEvent
if err := decoder.Decode(&e); err != nil {
return nil, fmt.Errorf("decode query event: %w", err)
}
if e.Columns == nil {
return nil, fmt.Errorf("expected columns event, got: %+v", e)
}
return &Rows{
ctx: ctx,
body: body,
decoder: decoder,
closeOnEOQ: closeOnEOQ,
columns: e.Columns,
}, nil
}
// Columns returns the column names.
func (rs *Rows) Columns() []string {
return rs.columns
}
// Next prepares the next result row for reading with the [Rows.Scan] method. It returns true on success, or false
// if there is no next result row or an error happened while preparing it. [Rows.Err] should be consulted to distinguish
// between the two cases.
//
// Every call to [Rows.Scan], even the first one, must be preceded by a call to [Rows.Next].
func (rs *Rows) Next() bool {
select {
case <-rs.ctx.Done():
rs.err = rs.ctx.Err()
_ = rs.Close()
return false
default:
}
var e QueryEvent
if err := rs.decoder.Decode(&e); err != nil {
rs.err = fmt.Errorf("decode query event: %w", err)
_ = rs.Close()
return false
}
// Server-side query error.
if e.Error != nil {
rs.err = fmt.Errorf("query error: %s", *e.Error)
_ = rs.Close()
return false
}
if e.Row != nil {
if len(e.Row.Values) != len(rs.columns) {
rs.err = fmt.Errorf("expected %d column values, got %d", len(rs.columns), len(e.Row.Values))
_ = rs.Close()
return false
}
rs.row = *e.Row
return true
}
if e.EOQ != nil {
rs.eoq = e.EOQ
// Rows could be used as part of a subscription, so don't close the body if so.
if rs.closeOnEOQ {
_ = rs.Close()
}
return false
}
rs.err = fmt.Errorf("expected row or eof event, got: %+v", e)
_ = rs.Close()
return false
}
// Err returns the error, if any, that was encountered during iteration.
// Err may be called after an explicit or implicit [Rows.Close].
func (rs *Rows) Err() error {
return rs.err
}
// Scan copies the columns in the current row into the values pointed at by dest.
// The number of values in dest must be the same as the number of columns in [Rows].
// Scan converts JSON-encoded column values to the provided Go types using [json.Unmarshal].
func (rs *Rows) Scan(dest ...any) error {
if rs.err != nil {
return rs.err
}
if len(dest) != len(rs.columns) {
return fmt.Errorf("expected %d values, got %d", len(rs.columns), len(dest))
}
for i, v := range rs.row.Values {
if err := json.Unmarshal(v, dest[i]); err != nil {
return fmt.Errorf("unmarshal column value #%d: %w", i, err)
}
}
return nil
}
// Time returns the time taken to execute the query in seconds. It's only available after all rows have been consumed.
// It doesn't include the time to send the query, receive the response, or iterate over the rows.
func (rs *Rows) Time() (float64, error) {
if rs.eoq == nil {
if rs.Err() != nil {
return 0, fmt.Errorf("time is not available: %w", rs.Err())
}
return 0, errors.New("time is not available until all rows are consumed")
}
return rs.eoq.Time, nil
}
// Close closes the [Rows], preventing further enumeration. If [Rows.Next] is called and returns false,
// the [Rows] are closed automatically and it will suffice to check the result of [Rows.Err].
// Close is idempotent and does not affect the result of [Rows.Err].
func (rs *Rows) Close() error {
return rs.body.Close()
}