From 2c744d441563266c01f46a9297385bd3927a8e06 Mon Sep 17 00:00:00 2001 From: Lucy Zhang Date: Wed, 25 Sep 2019 11:23:08 -0400 Subject: [PATCH] roachtest: fix schemachange/mixed/tpcc for 19.1 `schemachange/mixed/tpcc` uses `CREATE TABLE AS` in 19.2. This PR will have the test correctly create a similar table in 19.1 without using `CREATE TABLE AS`. Release justification: Fixes a test. Release note: None --- pkg/cmd/roachtest/schemachange.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/roachtest/schemachange.go b/pkg/cmd/roachtest/schemachange.go index 77848013b6c3..7f35f51b9118 100644 --- a/pkg/cmd/roachtest/schemachange.go +++ b/pkg/cmd/roachtest/schemachange.go @@ -418,7 +418,16 @@ func makeMixedSchemaChanges(spec clusterSpec, warehouses int, length time.Durati if t.IsBuildVersion(`v19.2.0`) { if err := runAndLogStmts(ctx, t, c, "mixed-schema-changes-19.2", []string{ // CREATE TABLE AS with a specified primary key was added in 19.2. - `CREATE TABLE tpcc.orderpks (o_w_id, o_d_id, o_id, PRIMARY KEY(o_w_id, o_d_id, o_id)) AS select o_w_id, o_d_id, o_id from tpcc.order;`, + `CREATE TABLE tpcc.orderpks (o_w_id, o_d_id, o_id, PRIMARY KEY(o_w_id, o_d_id, o_id)) AS select o_w_id, o_d_id, o_id FROM tpcc.order;`, + }); err != nil { + return err + } + } else { + if err := runAndLogStmts(ctx, t, c, "mixed-schema-changes-19.1", []string{ + `CREATE TABLE tpcc.orderpks (o_w_id, o_d_id, o_id, PRIMARY KEY(o_w_id, o_d_id, o_id));`, + // We can't populate the table with CREATE TABLE AS, so just + // insert the rows. AOST is used to reduce contention. + `INSERT INTO tpcc.orderpks SELECT o_w_id, o_d_id, o_id FROM tpcc.order AS OF SYSTEM TIME '-1s';`, }); err != nil { return err }