sql/plan: correctly count processed index rows globally instead of pe…

…r partition Signed-off-by: Miguel Molina <[email protected]> (cherry picked from commit 22c8983)
src-d · Oct 17, 2018 · 22dbafa · 22dbafa
1 parent cdea792
commit 22dbafa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/sql/index/pilosa/index.go b/sql/index/pilosa/index.go
@@ -143,7 +143,7 @@ func (idx *pilosaIndex) Expressions() []string {
 	return idx.expressions
 }
 
-func (pilosaIndex) Driver() string { return DriverID }
+func (*pilosaIndex) Driver() string { return DriverID }
 
 func (idx *pilosaIndex) AscendGreaterOrEqual(keys ...interface{}) (sql.IndexLookup, error) {
 	if len(keys) != len(idx.expressions) {

diff --git a/sql/plan/create_index.go b/sql/plan/create_index.go
@@ -398,6 +398,7 @@ type loggingPartitionKeyValueIter struct {
 	ctx  *sql.Context
 	log  *logrus.Entry
 	iter sql.PartitionIndexKeyValueIter
+	rows uint64
 }
 
 func newLoggingPartitionKeyValueIter(
@@ -418,7 +419,7 @@ func (i *loggingPartitionKeyValueIter) Next() (sql.Partition, sql.IndexKeyValueI
 		return nil, nil, err
 	}
 
-	return p, newLoggingKeyValueIter(i.ctx, i.log, iter), nil
+	return p, newLoggingKeyValueIter(i.ctx, i.log, iter, &i.rows), nil
 }
 
 func (i *loggingPartitionKeyValueIter) Close() error {
@@ -430,20 +431,22 @@ type loggingKeyValueIter struct {
 	span  opentracing.Span
 	log   *logrus.Entry
 	iter  sql.IndexKeyValueIter
-	rows  uint64
+	rows  *uint64
 	start time.Time
 }
 
 func newLoggingKeyValueIter(
 	ctx *sql.Context,
 	log *logrus.Entry,
 	iter sql.IndexKeyValueIter,
+	rows *uint64,
 ) *loggingKeyValueIter {
 	return &loggingKeyValueIter{
 		ctx:   ctx,
 		log:   log,
 		iter:  iter,
 		start: time.Now(),
+		rows:  rows,
 	}
 }
 
@@ -456,13 +459,13 @@ func (i *loggingKeyValueIter) Next() ([]interface{}, []byte, error) {
 		)
 	}
 
-	i.rows++
-	if i.rows%sql.IndexBatchSize == 0 {
+	(*i.rows)++
+	if *i.rows%sql.IndexBatchSize == 0 {
 		duration := time.Since(i.start)
 
 		i.log.WithFields(logrus.Fields{
 			"duration": duration,
-			"rows":     i.rows,
+			"rows":     *i.rows,
 		}).Debugf("still creating index")
 
 		if i.span != nil {