joao-r-reis commented on code in PR #1868:
URL: 
https://github.com/apache/cassandra-gocql-driver/pull/1868#discussion_r2012234094


##########
query_executor.go:
##########
@@ -201,16 +210,375 @@ func (q *queryExecutor) do(ctx context.Context, qry 
ExecutableQuery, hostIter Ne
        }
 
        if lastErr != nil {
-               return &Iter{err: lastErr}
+               return newErrIter(lastErr, qry.getQueryMetrics())
        }
 
-       return &Iter{err: ErrNoConnections}
+       return newErrIter(ErrNoConnections, qry.getQueryMetrics())
 }
 
-func (q *queryExecutor) run(ctx context.Context, qry ExecutableQuery, hostIter 
NextHost, results chan<- *Iter) {
+func (q *queryExecutor) run(ctx context.Context, qry internalRequest, hostIter 
NextHost, results chan<- *Iter) {
        select {
        case results <- q.do(ctx, qry, hostIter):
        case <-ctx.Done():
        }
-       qry.releaseAfterExecution()
+}
+
+type queryOptions struct {
+       stmt                  string
+       values                []interface{}
+       initialConsistency    Consistency
+       pageSize              int
+       initialPageState      []byte
+       prefetch              float64
+       trace                 Tracer
+       observer              QueryObserver
+       rt                    RetryPolicy
+       spec                  SpeculativeExecutionPolicy
+       binding               func(q *QueryInfo) ([]interface{}, error)
+       serialCons            SerialConsistency
+       defaultTimestamp      bool
+       defaultTimestampValue int64
+       disableSkipMetadata   bool
+       context               context.Context
+       idempotent            bool
+       customPayload         map[string][]byte
+       keyspace              string
+       disableAutoPage       bool
+       skipPrepare           bool
+       routingKey            []byte
+
+       // getKeyspace is field so that it can be overriden in tests
+       getKeyspace func() string
+}
+
+func newQueryOptions(q *Query) *queryOptions {
+       return &queryOptions{

Review Comment:
   I think copying `values` and `customPayload` might be a bit too much due to 
performance reasons. `initialPageState` should probably be copied for safety 
and since its length is usually pretty small. `routingKey` I'm not so sure, I 
think it will be `nil` the vast majority of cases anyway but I can make sure it 
gets copied as well



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org
For additional commands, e-mail: pr-h...@cassandra.apache.org

Reply via email to