Merge pull request #132099 from cockroachdb/blathers/backport-release…

…-24.1.6-rc-132036

release-24.1.6-rc: sql/copy: use the proper interface for internal queries

pkg/sql/copy/BUILD.bazel

@@ -13,6 +13,7 @@ go_test(
     shard_count = 4,
     deps = [
         "//pkg/base",
+        "//pkg/ccl",
         "//pkg/cli/clisqlclient",
         "//pkg/kv",
         "//pkg/kv/kvclient/kvcoord",

pkg/sql/copy/copy_test.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/cockroachdb/apd/v3"
 	"github.com/cockroachdb/cockroach/pkg/base"
+	"github.com/cockroachdb/cockroach/pkg/ccl"
 	"github.com/cockroachdb/cockroach/pkg/cli/clisqlclient"
 	"github.com/cockroachdb/cockroach/pkg/kv"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverbase"
@@ -89,6 +90,7 @@ const csvData = `%d|155190|7706|1|17|21168.23|0.04|0.02|N|O|1996-03-13|1996-02-1
 
 func TestDataDriven(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer ccl.TestingEnableEnterprise()() // allow usage of READ COMMITTED
 	ctx := context.Background()
 
 	doTest := func(t *testing.T, d *datadriven.TestData, conn clisqlclient.Conn) string {

pkg/sql/copy/testdata/copy_to_read_committed

@@ -0,0 +1,27 @@
+# Verify that the default transaction isolation level is applied to the
+# internal queries issued by the COPY command.
+exec-ddl
+SET default_transaction_isolation = 'read committed'
+----
+
+copy-to
+COPY (SELECT current_setting('transaction_isolation')) TO STDOUT
+----
+read committed
+
+copy-to
+COPY (SELECT 1, 2, 3) TO STDOUT
+----
+1	2	3
+
+copy-to
+COPY (
+  SELECT repeat('a' || i::STRING, 5), repeat('b' || i::STRING, 5)
+  FROM ROWS FROM (generate_series(1, 5)) AS i
+) TO STDOUT;
+----
+a1a1a1a1a1	b1b1b1b1b1
+a2a2a2a2a2	b2b2b2b2b2
+a3a3a3a3a3	b3b3b3b3b3
+a4a4a4a4a4	b4b4b4b4b4
+a5a5a5a5a5	b5b5b5b5b5

pkg/sql/copy_to.go

@@ -186,10 +186,10 @@ func runCopyTo(
 		}).String()
 	}
 
-	it, err := p.execCfg.InternalDB.NewInternalExecutor(p.SessionData()).QueryIteratorEx(
+	it, err := p.InternalSQLTxn().QueryIteratorEx(
 		ctx,
 		cmd.Stmt.String(),
-		txn,
+		p.Txn(),
 		sessiondata.NoSessionDataOverride,
 		q,
 	)

pkg/sql/isql/isql_db.go

@@ -240,9 +240,6 @@ type Rows interface {
 	// Types returns the types of the columns returned by this iterator. The
 	// returned array is guaranteed to correspond 1:1 with the tree.Datums rows
 	// returned by Cur().
-	//
-	// WARNING: this method is safe to call anytime *after* the first call to
-	// Next() (including after Close() was called).
 	Types() colinfo.ResultColumns
 
 	// HasResults returns true if there are results to the query, false otherwise.