sql: add Close() method to RowIter.

cmd/gitql/query_base.go

@@ -103,6 +103,11 @@ func (c *cmdQueryBase) printQuery(schema sql.Schema, iter sql.RowIter, formatId
 		}
 	}
 
+	if err := iter.Close(); err != nil {
+		_ = f.Close()
+		return err
+	}
+
 	return f.Close()
 }
 

git/blobs.go

@@ -64,6 +64,11 @@ func (i *blobIter) Next() (sql.Row, error) {
 	return blobToRow(blob), nil
 }
 
+func (i *blobIter) Close() error {
+	i.i.Close()
+	return nil
+}
+
 func blobToRow(c *object.Blob) sql.Row {
 	return sql.NewRow(
 		c.Hash.String(),

git/commits.go

@@ -69,6 +69,11 @@ func (i *commitIter) Next() (sql.Row, error) {
 	return commitToRow(commit), nil
 }
 
+func (i *commitIter) Close() error {
+	i.i.Close()
+	return nil
+}
+
 func commitToRow(c *object.Commit) sql.Row {
 	return sql.NewRow(
 		c.Hash.String(),

git/objects.go

@@ -64,6 +64,11 @@ func (i *objectIter) Next() (sql.Row, error) {
 	return objectToRow(o), nil
 }
 
+func (i *objectIter) Close() error {
+	i.i.Close()
+	return nil
+}
+
 func objectToRow(o object.Object) sql.Row {
 	return sql.NewRow(
 		o.ID().String(),

git/references.go

@@ -70,6 +70,11 @@ func (i *referenceIter) Next() (sql.Row, error) {
 	return referenceToRow(reference), nil
 }
 
+func (i *referenceIter) Close() error {
+	i.i.Close()
+	return nil
+}
+
 func referenceToRow(c *plumbing.Reference) sql.Row {
 	return sql.NewRow(
 		c.Hash().String(),

git/tags.go

@@ -69,6 +69,11 @@ func (i *tagIter) Next() (sql.Row, error) {
 	return tagToRow(tag), nil
 }
 
+func (i *tagIter) Close() error {
+	i.i.Close()
+	return nil
+}
+
 func tagToRow(c *object.Tag) sql.Row {
 	return sql.NewRow(
 		c.Hash.String(),

git/tree_entries.go

@@ -85,6 +85,11 @@ func (i *treeEntryIter) Next() (sql.Row, error) {
 	}
 }
 
+func (i *treeEntryIter) Close() error {
+	i.i.Close()
+	return nil
+}
+
 func treeEntryToRow(t *object.Tree, e object.TreeEntry) sql.Row {
 	return sql.NewRow(
 		t.ID().String(),

mem/table.go

@@ -78,3 +78,8 @@ func (i *iter) Next() (sql.Row, error) {
 	i.idx++
 	return row.Copy(), nil
 }
+
+func (i *iter) Close() error {
+	i.rows = nil
+	return nil
+}

sql/plan/cross_join.go

@@ -101,6 +101,15 @@ func (i *crossJoinIterator) Next() (sql.Row, error) {
 	return row, nil
 }
 
+func (i *crossJoinIterator) Close() error {
+	if err := i.li.Close(); err != nil {
+		_ = i.ri.Close()
+		return err
+	}
+
+	return i.ri.Close()
+}
+
 func (i *crossJoinIterator) fillRows() error {
 	for {
 		rr, err := i.ri.Next()

sql/plan/describe.go

@@ -59,3 +59,7 @@ func (i *describeIter) Next() (sql.Row, error) {
 	i.i++
 	return sql.NewRow(f.Name, f.Type.Name()), nil
 }
+
+func (i *describeIter) Close() error {
+	return nil
+}

sql/plan/filter.go

@@ -57,3 +57,7 @@ func (i *filterIter) Next() (sql.Row, error) {
 		}
 	}
 }
+
+func (i *filterIter) Close() error {
+	return i.childIter.Close()
+}

sql/plan/group_by.go

@@ -99,6 +99,11 @@ func (i *groupByIter) Next() (sql.Row, error) {
 	return row, nil
 }
 
+func (i *groupByIter) Close() error {
+	i.rows = nil
+	return i.childIter.Close()
+}
+
 func (i *groupByIter) computeRows() error {
 	rows := []sql.Row{}
 	for {

sql/plan/limit.go

@@ -61,3 +61,7 @@ func (li *limitIter) Next() (sql.Row, error) {
 	}
 	return childRow, nil
 }
+
+func (li *limitIter) Close() error {
+	return li.childIter.Close()
+}

sql/plan/project.go

@@ -69,6 +69,10 @@ func (i *iter) Next() (sql.Row, error) {
 	return filterRow(i.p.Expressions, childRow), nil
 }
 
+func (i *iter) Close() error {
+	return i.childIter.Close()
+}
+
 func filterRow(expressions []sql.Expression, row sql.Row) sql.Row {
 	fields := []interface{}{}
 	for _, expr := range expressions {

sql/plan/show_tables.go

@@ -65,3 +65,8 @@ func (i *showTablesIter) Next() (sql.Row, error) {
 
 	return row, nil
 }
+
+func (i *showTablesIter) Close() error {
+	i.tableNames = nil
+	return nil
+}

sql/plan/sort.go

@@ -103,6 +103,11 @@ func (i *sortIter) Next() (sql.Row, error) {
 	return row, nil
 }
 
+func (i *sortIter) Close() error {
+	i.sortedRows = nil
+	return i.childIter.Close()
+}
+
 func (i *sortIter) computeSortedRows() error {
 	rows := []sql.Row{}
 	for {

sql/row.go

@@ -25,6 +25,7 @@ type Value interface{}
 
 type RowIter interface {
 	Next() (Row, error)
+	Close() error
 }
 
 func RowIterToRows(i RowIter) ([]Row, error) {
@@ -42,7 +43,7 @@ func RowIterToRows(i RowIter) ([]Row, error) {
 		rows = append(rows, row)
 	}
 
-	return rows, nil
+	return rows, i.Close()
 }
 
 func NodeToRows(n Node) ([]Row, error) {