rename var includeAllData to includeFitData

influxql/call_iterator.go

@@ -1061,17 +1061,17 @@ func newMovingAverageIterator(input Iterator, n int, opt IteratorOptions) (Itera
 }
 
 // newHoltWintersIterator returns an iterator for operating on a elapsed() call.
-func newHoltWintersIterator(input Iterator, opt IteratorOptions, h, m int, includeAllData bool, interval time.Duration) (Iterator, error) {
+func newHoltWintersIterator(input Iterator, opt IteratorOptions, h, m int, includeFitData bool, interval time.Duration) (Iterator, error) {
 	switch input := input.(type) {
 	case FloatIterator:
 		createFn := func() (FloatPointAggregator, FloatPointEmitter) {
-			fn := NewFloatHoltWintersReducer(h, m, includeAllData, interval)
+			fn := NewFloatHoltWintersReducer(h, m, includeFitData, interval)
 			return fn, fn
 		}
 		return &floatReduceFloatIterator{input: newBufFloatIterator(input), opt: opt, create: createFn}, nil
 	case IntegerIterator:
 		createFn := func() (IntegerPointAggregator, FloatPointEmitter) {
-			fn := NewFloatHoltWintersReducer(h, m, includeAllData, interval)
+			fn := NewFloatHoltWintersReducer(h, m, includeFitData, interval)
 			return fn, fn
 		}
 		return &integerReduceFloatIterator{input: newBufIntegerIterator(input), opt: opt, create: createFn}, nil

influxql/functions.go

@@ -341,7 +341,7 @@ type FloatHoltWintersReducer struct {
 	interval int64
 
 	// Whether to include all data or only future values
-	includeAllData bool
+	includeFitData bool
 
 	y      []float64
 	points []FloatPoint
@@ -355,7 +355,7 @@ const (
 )
 
 // NewFloatHoltWintersReducer creates a new FloatHoltWintersReducer.
-func NewFloatHoltWintersReducer(h, m int, includeAllData bool, interval time.Duration) *FloatHoltWintersReducer {
+func NewFloatHoltWintersReducer(h, m int, includeFitData bool, interval time.Duration) *FloatHoltWintersReducer {
 	seasonal := true
 	if m < 2 {
 		seasonal = false
@@ -368,7 +368,7 @@ func NewFloatHoltWintersReducer(h, m int, includeAllData bool, interval time.Dur
 		h:              h,
 		m:              m,
 		seasonal:       seasonal,
-		includeAllData: includeAllData,
+		includeFitData: includeFitData,
 		interval:       int64(interval),
 	}
 }
@@ -489,7 +489,7 @@ func (r *FloatHoltWintersReducer) Emit() []FloatPoint {
 	// Forecast
 	forecasted := r.forecast(r.h, params)
 	var points []FloatPoint
-	if r.includeAllData {
+	if r.includeFitData {
 		points = make([]FloatPoint, len(forecasted))
 		for i, v := range forecasted {
 			t := start + r.interval*(int64(i))

influxql/select.go

@@ -251,15 +251,15 @@ func buildExprIterator(expr Expr, ic IteratorCreator, opt IteratorOptions, selec
 			h := expr.Args[1].(*IntegerLiteral)
 			m := expr.Args[2].(*IntegerLiteral)
 
-			includeAllData := "holt_winters_with_fit" == expr.Name
+			includeFitData := "holt_winters_with_fit" == expr.Name
 
 			interval := opt.Interval.Duration
 			// Redifine interval to be unbounded to capture all aggregate results
 			opt.StartTime = MinTime
 			opt.EndTime = MaxTime
 			opt.Interval = Interval{}
 
-			return newHoltWintersIterator(input, opt, int(h.Val), int(m.Val), includeAllData, interval)
+			return newHoltWintersIterator(input, opt, int(h.Val), int(m.Val), includeFitData, interval)
 		case "derivative", "non_negative_derivative", "difference", "moving_average", "elapsed":
 			if !opt.Interval.IsZero() {
 				if opt.Ascending {