[no-release-notes] another max1row iter (#8210)

* [no-release-notes] bump for another max1iter * bug fix * bump * fix test build * more test build * more test build * more test build * bump * bump
dolthub · Aug 6, 2024 · 594fd2d · 594fd2d
1 parent e8053d5
commit 594fd2d
Show file tree

Hide file tree

Showing 50 changed files with 124 additions and 124 deletions.
diff --git a/go/cmd/dolt/cli/command.go b/go/cmd/dolt/cli/command.go
@@ -85,7 +85,7 @@ type SignalCommand interface {
 // Queryist is generic interface for executing queries. Commands will be provided a Queryist to perform any work using
 // SQL. The Queryist can be obtained from the CliContext passed into the Exec method by calling the QueryEngine method.
 type Queryist interface {
-	Query(ctx *sql.Context, query string) (sql.Schema, sql.RowIter, error)
+	Query(ctx *sql.Context, query string) (sql.Schema, sql.RowIter, *sql.QueryFlags, error)
 }
 
 // This type is to store the content of a documented command, elsewhere we can transform this struct into

diff --git a/go/cmd/dolt/commands/add.go b/go/cmd/dolt/commands/add.go
@@ -117,7 +117,7 @@ func (cmd AddCmd) Exec(ctx context.Context, commandStr string, args []string, dE
 	}
 
 	// Allow staging tables with merge conflicts.
-	_, _, err = queryist.Query(sqlCtx, "set @@dolt_force_transaction_commit=1;")
+	_, _, _, err = queryist.Query(sqlCtx, "set @@dolt_force_transaction_commit=1;")
 	if err != nil {
 		cli.PrintErrln(errhand.VerboseErrorFromError(err))
 		return 1
@@ -129,7 +129,7 @@ func (cmd AddCmd) Exec(ctx context.Context, commandStr string, args []string, dE
 		}
 	}
 
-	_, rowIter, err := queryist.Query(sqlCtx, generateAddSql(apr))
+	_, rowIter, _, err := queryist.Query(sqlCtx, generateAddSql(apr))
 	if err != nil {
 		cli.PrintErrln(errhand.VerboseErrorFromError(err))
 		return 1

diff --git a/go/cmd/dolt/commands/assist.go b/go/cmd/dolt/commands/assist.go
@@ -587,7 +587,7 @@ func getCreateTableStatements(ctx *sql.Context, sqlEngine *engine.SqlEngine, dEn
 
 	tables, err := root.GetTableNames(ctx, doltdb.DefaultSchemaName)
 	for _, table := range tables {
-		_, iter, err := sqlEngine.Query(ctx, fmt.Sprintf("SHOW CREATE TABLE %s", sql.QuoteIdentifier(table)))
+		_, iter, _, err := sqlEngine.Query(ctx, fmt.Sprintf("SHOW CREATE TABLE %s", sql.QuoteIdentifier(table)))
 		if err != nil {
 			return "", err
 		}

diff --git a/go/cmd/dolt/commands/blame.go b/go/cmd/dolt/commands/blame.go
@@ -114,7 +114,7 @@ func (cmd BlameCmd) Exec(ctx context.Context, commandStr string, args []string,
 	var schema sql.Schema
 	var ri sql.RowIter
 	if apr.NArg() == 1 {
-		schema, ri, err = queryist.Query(sqlCtx, fmt.Sprintf(blameQueryTemplate, apr.Arg(0), "HEAD"))
+		schema, ri, _, err = queryist.Query(sqlCtx, fmt.Sprintf(blameQueryTemplate, apr.Arg(0), "HEAD"))
 	} else {
 		// validate input
 		ref := apr.Arg(0)
@@ -123,7 +123,7 @@ func (cmd BlameCmd) Exec(ctx context.Context, commandStr string, args []string,
 			return 1
 		}
 
-		schema, ri, err = queryist.Query(sqlCtx, fmt.Sprintf(blameQueryTemplate, apr.Arg(1), apr.Arg(0)))
+		schema, ri, _, err = queryist.Query(sqlCtx, fmt.Sprintf(blameQueryTemplate, apr.Arg(1), apr.Arg(0)))
 	}
 	if err != nil {
 		iohelp.WriteLine(cli.CliOut, err.Error())

diff --git a/go/cmd/dolt/commands/branch.go b/go/cmd/dolt/commands/branch.go
@@ -160,7 +160,7 @@ func getBranches(sqlCtx *sql.Context, queryEngine cli.Queryist, remote bool) ([]
 		command = "SELECT name, hash from dolt_branches"
 	}
 
-	schema, rowIter, err := queryEngine.Query(sqlCtx, command)
+	schema, rowIter, _, err := queryEngine.Query(sqlCtx, command)
 	if err != nil {
 		return nil, err
 	}
@@ -488,7 +488,7 @@ func callStoredProcedure(sqlCtx *sql.Context, queryEngine cli.Queryist, args []s
 	if err != nil {
 		return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), nil)
 	}
-	_, rowIter, err := queryEngine.Query(sqlCtx, query)
+	_, rowIter, _, err := queryEngine.Query(sqlCtx, query)
 	if err != nil {
 		if strings.Contains(err.Error(), "is not fully merged") {
 			newErrorMessage := fmt.Sprintf("%s. If you are sure you want to delete it, run 'dolt branch -D%s'", err.Error(), generateForceDeleteMessage(args))

diff --git a/go/cmd/dolt/commands/cherry-pick.go b/go/cmd/dolt/commands/cherry-pick.go
@@ -107,7 +107,7 @@ func (cmd CherryPickCmd) Exec(ctx context.Context, commandStr string, args []str
 	}
 
 	if apr.Contains(cli.NoJsonMergeFlag) {
-		_, _, err = queryist.Query(sqlCtx, "set @@session.dolt_dont_merge_json = 1")
+		_, _, _, err = queryist.Query(sqlCtx, "set @@session.dolt_dont_merge_json = 1")
 		if err != nil {
 			cli.Println(err.Error())
 			return 1

diff --git a/go/cmd/dolt/commands/cnfcmds/cat.go b/go/cmd/dolt/commands/cnfcmds/cat.go
@@ -168,7 +168,7 @@ func printConflicts(queryist cli.Queryist, sqlCtx *sql.Context, tblNames []strin
 			return fmt.Errorf("error: failed to interpolate query for table '%s': %w", tblName, err)
 		}
 
-		confSqlSch, rowItr, err := queryist.Query(sqlCtx, q)
+		confSqlSch, rowItr, _, err := queryist.Query(sqlCtx, q)
 		if err != nil {
 			return fmt.Errorf("error: failed to get conflict rows for table '%s': %w", tblName, err)
 		}
@@ -220,7 +220,7 @@ func printSchemaConflicts(queryist cli.Queryist, sqlCtx *sql.Context, wrCloser i
 	if err != nil {
 		return err
 	}
-	sqlSch, rowItr, err := queryist.Query(sqlCtx, q)
+	sqlSch, rowItr, _, err := queryist.Query(sqlCtx, q)
 	if err != nil {
 		return err
 	}

diff --git a/go/cmd/dolt/commands/commit.go b/go/cmd/dolt/commands/commit.go
@@ -133,7 +133,7 @@ func performCommit(ctx context.Context, commandStr string, args []string, cliCtx
 	if !msgOk {
 		amendStr := ""
 		if apr.Contains(cli.AmendFlag) {
-			_, rowIter, err := queryist.Query(sqlCtx, "select message from dolt_log() limit 1")
+			_, rowIter, _, err := queryist.Query(sqlCtx, "select message from dolt_log() limit 1")
 			if err != nil {
 				cli.Println(err.Error())
 				return 1, false
@@ -162,7 +162,7 @@ func performCommit(ctx context.Context, commandStr string, args []string, cliCtx
 		return 1, false
 	}
 
-	_, rowIter, err := queryist.Query(sqlCtx, interpolatedQuery)
+	_, rowIter, _, err := queryist.Query(sqlCtx, interpolatedQuery)
 	if err != nil {
 		return handleCommitErr(sqlCtx, queryist, err, usage), false
 	}
@@ -299,7 +299,7 @@ func handleCommitErr(sqlCtx *sql.Context, queryist cli.Queryist, err error, usag
 	}
 
 	if err.Error() == "nothing to commit" {
-		_, ri, err := queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = false")
+		_, ri, _, err := queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = false")
 		if err != nil {
 			cli.Println(err)
 			return 1
@@ -389,7 +389,7 @@ func buildInitalCommitMsg(sqlCtx *sql.Context, queryist cli.Queryist, suggestedM
 	initialNoColor := color.NoColor
 	color.NoColor = true
 
-	_, ri, err := queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = true")
+	_, ri, _, err := queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = true")
 	if err != nil {
 		return "", err
 	}
@@ -398,7 +398,7 @@ func buildInitalCommitMsg(sqlCtx *sql.Context, queryist cli.Queryist, suggestedM
 		return "", err
 	}
 
-	_, ri, err = queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = false")
+	_, ri, _, err = queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = false")
 	if err != nil {
 		return "", err
 	}
@@ -456,7 +456,7 @@ func PrintDiffsNotStaged(
 	linesPrinted int,
 ) (int, error) {
 	// get data conflict tables
-	_, ri, err := queryist.Query(sqlCtx, "select `table` from dolt_conflicts")
+	_, ri, _, err := queryist.Query(sqlCtx, "select `table` from dolt_conflicts")
 	if err != nil {
 		return 0, err
 	}
@@ -471,7 +471,7 @@ func PrintDiffsNotStaged(
 	inCnfSet := set.NewStrSet(conflictTables)
 
 	// get schema conflict tables
-	_, ri, err = queryist.Query(sqlCtx, "select table_name from dolt_status where status = 'schema conflict'")
+	_, ri, _, err = queryist.Query(sqlCtx, "select table_name from dolt_status where status = 'schema conflict'")
 	if err != nil {
 		return 0, err
 	}
@@ -486,7 +486,7 @@ func PrintDiffsNotStaged(
 	inCnfSet.Add(schemaConflictTables...)
 
 	// get constraint violation tables
-	_, ri, err = queryist.Query(sqlCtx, "select `table` from dolt_constraint_violations")
+	_, ri, _, err = queryist.Query(sqlCtx, "select `table` from dolt_constraint_violations")
 	if err != nil {
 		return 0, err
 	}

diff --git a/go/cmd/dolt/commands/cvcmds/verify_constraints.go b/go/cmd/dolt/commands/cvcmds/verify_constraints.go
@@ -168,7 +168,7 @@ func printViolationsForTable(ctx context.Context, dbName, tblName string, tbl *d
 	}
 	sCtx.SetCurrentDatabase(dbName)
 
-	sqlSch, sqlItr, err := eng.Query(sCtx, query)
+	sqlSch, sqlItr, _, err := eng.Query(sCtx, query)
 	if err != nil {
 		return errhand.BuildDError("Error querying constraint violations").AddCause(err).Build()
 	}

diff --git a/go/cmd/dolt/commands/diff.go b/go/cmd/dolt/commands/diff.go
@@ -1204,7 +1204,7 @@ func diffDoltSchemasTable(
 		return errhand.BuildDError("Error building diff query").AddCause(err).Build()
 	}
 
-	_, rowIter, err := queryist.Query(sqlCtx, query)
+	_, rowIter, _, err := queryist.Query(sqlCtx, query)
 	if err != nil {
 		return errhand.BuildDError("Error running diff query:\n%s", query).AddCause(err).Build()
 	}
@@ -1471,7 +1471,7 @@ func diffRows(
 		return errhand.BuildDError("Error building diff query:\n%s", interpolatedQuery).AddCause(err).Build()
 	}
 
-	sch, rowIter, err := queryist.Query(sqlCtx, interpolatedQuery)
+	sch, rowIter, _, err := queryist.Query(sqlCtx, interpolatedQuery)
 	if sql.ErrSyntaxError.Is(err) {
 		return errhand.BuildDError("Failed to parse diff query. Invalid where clause?\nDiff query: %s", interpolatedQuery).AddCause(err).Build()
 	} else if err != nil {
@@ -1510,7 +1510,7 @@ func diffRows(
 		if err != nil {
 			return errhand.BuildDError("Error closing row iterator:\n%s", interpolatedQuery).AddCause(err).Build()
 		}
-		_, rowIter, err = queryist.Query(sqlCtx, interpolatedQuery)
+		_, rowIter, _, err = queryist.Query(sqlCtx, interpolatedQuery)
 		defer rowIter.Close(sqlCtx)
 		if sql.ErrSyntaxError.Is(err) {
 			return errhand.BuildDError("Failed to parse diff query. Invalid where clause?\nDiff query: %s", interpolatedQuery).AddCause(err).Build()

diff --git a/go/cmd/dolt/commands/docscmds/read.go b/go/cmd/dolt/commands/docscmds/read.go
@@ -159,7 +159,7 @@ func writeDocToTable(ctx context.Context, eng *engine.SqlEngine, dbName, docName
 
 func execQuery(sctx *sql.Context, eng *engine.SqlEngine, q string) (err error) {
 	var iter sql.RowIter
-	_, iter, err = eng.Query(sctx, q)
+	_, iter, _, err = eng.Query(sctx, q)
 	if err != nil {
 		return err
 	}

diff --git a/go/cmd/dolt/commands/docscmds/write.go b/go/cmd/dolt/commands/docscmds/write.go
@@ -130,7 +130,7 @@ func readDocFromTableAsOf(ctx context.Context, eng *engine.SqlEngine, dbName, do
 	}
 	sctx.SetCurrentDatabase(dbName)
 
-	_, iter, err = eng.Query(sctx, query)
+	_, iter, _, err = eng.Query(sctx, query)
 	if sql.ErrTableNotFound.Is(err) {
 		return "", errors.New("no dolt docs in this database")
 	}

diff --git a/go/cmd/dolt/commands/dump.go b/go/cmd/dolt/commands/dump.go
@@ -263,7 +263,7 @@ func dumpProcedures(sqlCtx *sql.Context, engine *engine.SqlEngine, root doltdb.R
 		return nil
 	}
 
-	sch, iter, err := engine.Query(sqlCtx, "select * from "+doltdb.ProceduresTableName)
+	sch, iter, _, err := engine.Query(sqlCtx, "select * from "+doltdb.ProceduresTableName)
 	if err != nil {
 		return err
 	}
@@ -334,7 +334,7 @@ func dumpTriggers(sqlCtx *sql.Context, engine *engine.SqlEngine, root doltdb.Roo
 		return nil
 	}
 
-	sch, iter, err := engine.Query(sqlCtx, "select * from "+doltdb.SchemasTableName)
+	sch, iter, _, err := engine.Query(sqlCtx, "select * from "+doltdb.SchemasTableName)
 	if err != nil {
 		return err
 	}
@@ -400,7 +400,7 @@ func dumpViews(ctx *sql.Context, engine *engine.SqlEngine, root doltdb.RootValue
 		return nil
 	}
 
-	sch, iter, err := engine.Query(ctx, "select * from "+doltdb.SchemasTableName)
+	sch, iter, _, err := engine.Query(ctx, "select * from "+doltdb.SchemasTableName)
 	if err != nil {
 		return err
 	}

diff --git a/go/cmd/dolt/commands/engine/sqlengine.go b/go/cmd/dolt/commands/engine/sqlengine.go
@@ -306,7 +306,7 @@ func (se *SqlEngine) NewDoltSession(_ context.Context, mysqlSess *sql.BaseSessio
 }
 
 // Query execute a SQL statement and return values for printing.
-func (se *SqlEngine) Query(ctx *sql.Context, query string) (sql.Schema, sql.RowIter, error) {
+func (se *SqlEngine) Query(ctx *sql.Context, query string) (sql.Schema, sql.RowIter, *sql.QueryFlags, error) {
 	return se.engine.Query(ctx, query)
 }
 

diff --git a/go/cmd/dolt/commands/fetch.go b/go/cmd/dolt/commands/fetch.go
@@ -97,7 +97,7 @@ func (cmd FetchCmd) Exec(ctx context.Context, commandStr string, args []string,
 	errChan := make(chan error)
 	go func() {
 		defer close(errChan)
-		_, _, err = queryist.Query(sqlCtx, query)
+		_, _, _, err = queryist.Query(sqlCtx, query)
 		if err != nil {
 			errChan <- err
 			return

diff --git a/go/cmd/dolt/commands/filter-branch.go b/go/cmd/dolt/commands/filter-branch.go
@@ -295,7 +295,7 @@ func processFilterQuery(ctx context.Context, dEnv *env.DoltEnv, root doltdb.Root
 		}
 
 		err = func() error {
-			_, itr, err := eng.Query(sqlCtx, q)
+			_, itr, _, err := eng.Query(sqlCtx, q)
 			if err != nil {
 				return err
 			}

diff --git a/go/cmd/dolt/commands/gc.go b/go/cmd/dolt/commands/gc.go
@@ -96,7 +96,7 @@ func (cmd GarbageCollectionCmd) Exec(ctx context.Context, commandStr string, arg
 		return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), usage)
 	}
 
-	_, _, err = queryist.Query(sqlCtx, query)
+	_, _, _, err = queryist.Query(sqlCtx, query)
 	if err != nil && err != chunks.ErrNothingToCollect {
 		return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), usage)
 	}

diff --git a/go/cmd/dolt/commands/ls.go b/go/cmd/dolt/commands/ls.go
@@ -98,15 +98,15 @@ func (cmd LsCmd) Exec(ctx context.Context, commandStr string, args []string, dEn
 		return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), usage)
 	}
 
-	_, _, err = queryist.Query(sqlCtx, "set @@dolt_show_system_tables = 1")
+	_, _, _, err = queryist.Query(sqlCtx, "set @@dolt_show_system_tables = 1")
 	if err != nil {
 		return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), usage)
 	}
 	rows, err := GetRowsForSql(queryist, sqlCtx, query)
 	if err != nil {
 		return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), usage)
 	}
-	_, _, err = queryist.Query(sqlCtx, "set @@dolt_show_system_tables = 0")
+	_, _, _, err = queryist.Query(sqlCtx, "set @@dolt_show_system_tables = 0")
 	if err != nil {
 		return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), usage)
 	}

diff --git a/go/cmd/dolt/commands/merge.go b/go/cmd/dolt/commands/merge.go
@@ -120,14 +120,14 @@ func (cmd MergeCmd) Exec(ctx context.Context, commandStr string, args []string,
 	}
 
 	// allows merges that create conflicts to stick
-	_, _, err = queryist.Query(sqlCtx, "set @@dolt_force_transaction_commit = 1")
+	_, _, _, err = queryist.Query(sqlCtx, "set @@dolt_force_transaction_commit = 1")
 	if err != nil {
 		cli.Println(err.Error())
 		return 1
 	}
 
 	if apr.Contains(cli.NoJsonMergeFlag) {
-		_, _, err = queryist.Query(sqlCtx, "set @@dolt_dont_merge_json = 1")
+		_, _, _, err = queryist.Query(sqlCtx, "set @@dolt_dont_merge_json = 1")
 		if err != nil {
 			cli.Println(err.Error())
 			return 1
@@ -139,7 +139,7 @@ func (cmd MergeCmd) Exec(ctx context.Context, commandStr string, args []string,
 		cli.Println(err.Error())
 		return 1
 	}
-	_, rowIter, err := queryist.Query(sqlCtx, query)
+	_, rowIter, _, err := queryist.Query(sqlCtx, query)
 	if err != nil {
 		cli.Println(err.Error())
 		return 1
@@ -167,7 +167,7 @@ func (cmd MergeCmd) Exec(ctx context.Context, commandStr string, args []string,
 	}
 
 	// if merge is called with '--no-commit', we need to commit the sql transaction or the staged changes will be lost
-	_, _, err = queryist.Query(sqlCtx, "COMMIT")
+	_, _, _, err = queryist.Query(sqlCtx, "COMMIT")
 	if err != nil {
 		cli.Println(err.Error())
 		return 1

diff --git a/go/cmd/dolt/commands/pull.go b/go/cmd/dolt/commands/pull.go
@@ -118,7 +118,7 @@ func (cmd PullCmd) Exec(ctx context.Context, commandStr string, args []string, d
 	go func() {
 		defer close(errChan)
 		// allows pulls (merges) that create conflicts to stick
-		_, _, err = queryist.Query(sqlCtx, "set @@dolt_force_transaction_commit = 1")
+		_, _, _, err = queryist.Query(sqlCtx, "set @@dolt_force_transaction_commit = 1")
 		if err != nil {
 			errChan <- err
 			return
@@ -130,13 +130,13 @@ func (cmd PullCmd) Exec(ctx context.Context, commandStr string, args []string, d
 			errChan <- err
 		}
 
-		_, rowIter, err := queryist.Query(sqlCtx, query)
+		_, rowIter, _, err := queryist.Query(sqlCtx, query)
 		if err != nil {
 			errChan <- err
 			return
 		}
 		// if merge is called with '--no-commit', we need to commit the sql transaction or the staged changes will be lost
-		_, _, err = queryist.Query(sqlCtx, "COMMIT")
+		_, _, _, err = queryist.Query(sqlCtx, "COMMIT")
 		if err != nil {
 			errChan <- err
 			return

diff --git a/go/cmd/dolt/commands/push.go b/go/cmd/dolt/commands/push.go
@@ -105,7 +105,7 @@ func (cmd PushCmd) Exec(ctx context.Context, commandStr string, args []string, d
 	errChan := make(chan error)
 	go func() {
 		defer close(errChan)
-		_, rowIter, err := queryist.Query(sqlCtx, query)
+		_, rowIter, _, err := queryist.Query(sqlCtx, query)
 		if err != nil {
 			errChan <- err
 			return

diff --git a/go/cmd/dolt/commands/query_diff.go b/go/cmd/dolt/commands/query_diff.go
@@ -121,7 +121,7 @@ func (q QueryDiff) Exec(ctx context.Context, commandStr string, args []string, d
 	if err != nil {
 		return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), usage)
 	}
-	schema, rowIter, err := queryist.Query(sqlCtx, query)
+	schema, rowIter, _, err := queryist.Query(sqlCtx, query)
 	if err != nil {
 		return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), usage)
 	}