group query options and batch options for readability, remove unused fields

Author: joao-r-reis

query_executor.go

@@ -229,28 +229,39 @@ func (q *queryExecutor) run(ctx context.Context, qry internalRequest, hostIter N
 }
 
 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
+	stmt string
+
+	// Paging
+	pageSize        int
+	disableAutoPage bool
+
+	// Monitoring
+	trace    Tracer
+	observer QueryObserver
+
+	// Parameters
+	values  []interface{}
+	binding func(q *QueryInfo) ([]interface{}, error)
+
+	// Timestamp
 	defaultTimestamp      bool
 	defaultTimestampValue int64
-	disableSkipMetadata   bool
-	context               context.Context
-	idempotent            bool
-	customPayload         map[string][]byte
-	keyspace              string
-	disableAutoPage       bool
-	skipPrepare           bool
-	routingKey            []byte
+
+	// Consistency
+	serialCons SerialConsistency
+
+	// Protocol flag
+	disableSkipMetadata bool
+
+	customPayload map[string][]byte
+	prefetch      float64
+	rt            RetryPolicy
+	spec          SpeculativeExecutionPolicy
+	context       context.Context
+	idempotent    bool
+	keyspace      string
+	skipPrepare   bool
+	routingKey    []byte
 
 	// getKeyspace is field so that it can be overriden in tests
 	getKeyspace func() string
@@ -274,9 +285,7 @@ func newQueryOptions(q *Query, ctx context.Context) *queryOptions {
 	return &queryOptions{
 		stmt:                  q.stmt,
 		values:                q.values,
-		initialConsistency:    q.initialConsistency,
 		pageSize:              q.pageSize,
-		initialPageState:      newPageState,
 		prefetch:              q.prefetch,
 		trace:                 q.trace,
 		observer:              q.observer,
@@ -309,12 +318,18 @@ type internalQuery struct {
 }
 
 func newInternalQuery(q *Query, ctx context.Context) *internalQuery {
+	var newPageState []byte
+	if q.initialPageState != nil {
+		pageState := q.initialPageState
+		newPageState = make([]byte, len(pageState))
+		copy(newPageState, pageState)
+	}
 	return &internalQuery{
 		originalQuery: q,
 		qryOpts:       newQueryOptions(q, ctx),
 		metrics:       &queryMetrics{m: make(map[string]*hostMetrics)},
 		consistency:   uint32(q.initialConsistency),
-		pageState:     nil,
+		pageState:     newPageState,
 		conn:          nil,
 		session:       q.session,
 		routingInfo:   &queryRoutingInfo{},
@@ -432,20 +447,24 @@ func (q *internalQuery) Statement() Statement {
 }
 
 type batchOptions struct {
-	bType                 BatchType
-	entries               []BatchEntry
-	customPayload         map[string][]byte
-	rt                    RetryPolicy
-	spec                  SpeculativeExecutionPolicy
-	trace                 Tracer
-	observer              BatchObserver
-	serialCons            SerialConsistency
+	trace    Tracer
+	observer BatchObserver
+
+	bType   BatchType
+	entries []BatchEntry
+
 	defaultTimestamp      bool
 	defaultTimestampValue int64
-	context               context.Context
-	keyspace              string
-	idempotent            bool
-	routingKey            []byte
+
+	serialCons SerialConsistency
+
+	customPayload map[string][]byte
+	rt            RetryPolicy
+	spec          SpeculativeExecutionPolicy
+	context       context.Context
+	keyspace      string
+	idempotent    bool
+	routingKey    []byte
 }
 
 func newBatchOptions(b *Batch, ctx context.Context) *batchOptions {