Skip to content

Commit

Permalink
GOCBC-733: Added missing Status field to QueryMetaData.
Browse files Browse the repository at this point in the history
Change-Id: Ib4eceb9558afe2895ea958c18dd46ac94d936f18
Reviewed-on: http://review.couchbase.org/120390
Reviewed-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
Tested-by: Brett Lawson <brett19@gmail.com>
  • Loading branch information
brett19 committed Jan 19, 2020
1 parent 0473f5d commit c73682e
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
4 changes: 3 additions & 1 deletion cluster_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type jsonQueryWarning struct {
type jsonQueryResponse struct {
RequestID string `json:"requestID"`
ClientContextID string `json:"clientContextID"`
Status string `json:"status"`
Status QueryStatus `json:"status"`
Warnings []jsonQueryWarning `json:"warnings"`
Metrics jsonQueryMetrics `json:"metrics"`
Profile interface{} `json:"profile"`
Expand Down Expand Up @@ -97,6 +97,7 @@ func (warning *QueryWarning) fromData(data jsonQueryWarning) error {
type QueryMetaData struct {
RequestID string
ClientContextID string
Status QueryStatus
Metrics QueryMetrics
Signature interface{}
Warnings []QueryWarning
Expand All @@ -118,6 +119,7 @@ func (meta *QueryMetaData) fromData(data jsonQueryResponse) error {

meta.RequestID = data.RequestID
meta.ClientContextID = data.ClientContextID
meta.Status = data.Status
meta.Metrics = metrics
meta.Signature = data.Signature
meta.Warnings = warnings
Expand Down
35 changes: 35 additions & 0 deletions constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,41 @@ const (
QueryIndexTypeView = QueryIndexType("views")
)

// QueryStatus provides information about the current status of a query.
type QueryStatus string

const (
// QueryStatusRunning indicates the query is still running
QueryStatusRunning = QueryStatus("running")

// QueryStatusSuccess indicates the query was successful.
QueryStatusSuccess = QueryStatus("success")

// QueryStatusErrors indicates a query completed with errors.
QueryStatusErrors = QueryStatus("errors")

// QueryStatusCompleted indicates a query has completed.
QueryStatusCompleted = QueryStatus("completed")

// QueryStatusStopped indicates a query has been stopped.
QueryStatusStopped = QueryStatus("stopped")

// QueryStatusTimeout indicates a query timed out.
QueryStatusTimeout = QueryStatus("timeout")

// QueryStatusClosed indicates that a query was closed.
QueryStatusClosed = QueryStatus("closed")

// QueryStatusFatal indicates that a query ended with a fatal error.
QueryStatusFatal = QueryStatus("fatal")

// QueryStatusAborted indicates that a query was aborted.
QueryStatusAborted = QueryStatus("aborted")

// QueryStatusUnknown indicates that the query status is unknown.
QueryStatusUnknown = QueryStatus("unknown")
)

// ServiceType specifies a particular Couchbase service type.
type ServiceType gocbcore.ServiceType

Expand Down

0 comments on commit c73682e

Please sign in to comment.