address PR comments

Author: joao-r-reis

query_executor.go

@@ -51,7 +51,9 @@ type ExecutableStatement interface {
 // (currently Query and Batch via Session.Query and Session.Batch)
 type Statement interface {
 	Iter() *Iter
+	IterContext(ctx context.Context) *Iter
 	Exec() error
+	ExecContext(ctx context.Context) error
 }
 
 type internalRequest interface {
@@ -341,7 +343,6 @@ type internalQuery struct {
 	qryOpts       *queryOptions
 	pageState     []byte
 	metrics       *queryMetrics
-	refCount      uint32
 	conn          *Conn
 	consistency   uint32
 	session       *Session
@@ -565,6 +566,7 @@ func newInternalBatch(batch *Batch, ctx context.Context) *internalBatch {
 		metrics:       &queryMetrics{m: make(map[string]*hostMetrics)},
 		routingInfo:   &queryRoutingInfo{},
 		session:       batch.session,
+		consistency:   uint32(batch.GetConsistency()),
 	}
 }
 

session.go

@@ -722,9 +722,9 @@ func (b *Batch) ExecContext(ctx context.Context) error {
 
 // Iter executes a batch operation and returns an Iter object
 // that can be used to access properties related to the execution like Iter.Attempts and Iter.Latency
-func (b *Batch) Iter() *Iter { return b.session.executeBatch(b, nil) }
+func (b *Batch) Iter() *Iter { return b.IterContext(nil) }
 
-// Iter executes a batch operation with the provided context and returns an Iter object
+// IterContext executes a batch operation with the provided context and returns an Iter object
 // that can be used to access properties related to the execution like Iter.Attempts and Iter.Latency
 func (b *Batch) IterContext(ctx context.Context) *Iter {
 	return b.session.executeBatch(b, ctx)