Skip to content

Reset query metrics for both Batch and Query #1885

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

Closed
wants to merge 1 commit into from
Closed

Reset query metrics for both Batch and Query #1885

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
14 changes: 14 additions & 0 deletions session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,9 @@ func (s *Session) executeBatch(batch *Batch) *Iter {
return &Iter{err: ErrSessionClosed}
}

// Drop metrics from prior query executions
batch.metrics.reset()

// Prevent the execution of the batch if greater than the limit
// Currently batches have a limit of 65536 queries.
// https://datastax-oss.atlassian.net/browse/JAVA-229
Expand Down Expand Up @@ -879,6 +882,14 @@ func (qm *queryMetrics) hostMetricsLocked(host *HostInfo) *hostMetrics {
return metrics
}

// reset resets metrics, to forget about prior query executions
func (qm *queryMetrics) reset() {
qm.l.Lock()
qm.m = make(map[string]*hostMetrics)
qm.totalAttempts = 0
qm.l.Unlock()
}

// attempts returns the number of times the query was executed.
func (qm *queryMetrics) attempts() int {
qm.l.Lock()
Expand Down Expand Up @@ -1352,6 +1363,9 @@ func (q *Query) Iter() *Iter {
if isUseStatement(q.stmt) {
return &Iter{err: ErrUseStmt}
}

// Drop metrics from prior query executions
q.metrics.reset()
// if the query was specifically run on a connection then re-use that
// connection when fetching the next results
if q.conn != nil {
Expand Down