Skip to content

Commit db4b651

Browse files
yuzefovichyuzefovich
committed
importer: simplify MakeTestingSimpleTableDescriptor
We no longer need any FK handling in this function, which allows us to remove some dead code. Also update error messages to not reference no longer open issues. Release note: None
1 parent 35f0ac7 commit db4b651

File tree

13 files changed

+42
-228
lines changed

13 files changed

+42
-228
lines changed

‎pkg/ccl/changefeedccl/avro/avro_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ func parseTableDesc(createTableStmt string) (catalog.TableDescriptor, error) {
7272
tableID := descpb.ID(bootstrap.TestingUserDescID(1))
7373
semaCtx := makeTestSemaCtx()
7474
mutDesc, err := importer.MakeTestingSimpleTableDescriptor(
75-
ctx, &semaCtx, st, createTable, parentID, keys.PublicSchemaID, tableID, importer.NoFKs, timeutil.Now().UnixNano())
75+
ctx, &semaCtx, st, createTable, parentID, keys.PublicSchemaID, tableID, timeutil.Now().UnixNano(),
76+
)
7677
if err != nil {
7778
return nil, err
7879
}

‎pkg/ccl/changefeedccl/encoder_json_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,8 @@ func parseTableDesc(createTableStmt string) (catalog.TableDescriptor, error) {
342342
tableID := descpb.ID(bootstrap.TestingUserDescID(1))
343343
semaCtx := makeTestSemaCtx()
344344
mutDesc, err := importer.MakeTestingSimpleTableDescriptor(
345-
ctx, &semaCtx, st, createTable, parentID, keys.PublicSchemaID, tableID, importer.NoFKs, timeutil.Now().UnixNano())
345+
ctx, &semaCtx, st, createTable, parentID, keys.PublicSchemaID, tableID, timeutil.Now().UnixNano(),
346+
)
346347
if err != nil {
347348
return nil, err
348349
}

‎pkg/ccl/changefeedccl/kcjsonschema/kafka_connect_json_schema_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ func parseTableDesc(createTableStmt string) (catalog.TableDescriptor, error) {
183183
tableID := descpb.ID(bootstrap.TestingUserDescID(1))
184184
semaCtx := makeTestSemaCtx()
185185
mutDesc, err := importer.MakeTestingSimpleTableDescriptor(
186-
ctx, &semaCtx, st, createTable, parentID, keys.PublicSchemaID, tableID, importer.NoFKs, timeutil.Now().UnixNano())
186+
ctx, &semaCtx, st, createTable, parentID, keys.PublicSchemaID, tableID, timeutil.Now().UnixNano(),
187+
)
187188
if err != nil {
188189
return nil, err
189190
}

‎pkg/ccl/partitionccl/zone_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,8 @@ func (pt partitioningTest) parse() (parsed parsedPartitioningTest, _ error) {
358358
st := cluster.MakeTestingClusterSettings()
359359
parentID, tableID := descpb.ID(bootstrap.TestingUserDescID(0)), descpb.ID(bootstrap.TestingUserDescID(1))
360360
mutDesc, err := importer.MakeTestingSimpleTableDescriptor(
361-
ctx, &semaCtx, st, createTable, parentID, keys.PublicSchemaID, tableID, importer.NoFKs, timeutil.Now().UnixNano())
361+
ctx, &semaCtx, st, createTable, parentID, keys.PublicSchemaID, tableID, timeutil.Now().UnixNano(),
362+
)
362363
if err != nil {
363364
return parsed, err
364365
}

‎pkg/cmd/smith/main.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ func parseSchemaDefinition(schemaPath string) (opts []sqlsmith.SmitherOption, _
236236
case *tree.CreateTable:
237237
tableID := descpb.ID(int(parentID) + i + 1)
238238
desc, err := importer.MakeTestingSimpleTableDescriptor(
239-
context.Background(), &semaCtx, st, t, parentID, keys.PublicSchemaID, tableID, importer.NoFKs, wall)
239+
context.Background(), &semaCtx, st, t, parentID, keys.PublicSchemaID, tableID, wall,
240+
)
240241
if err != nil {
241242
return nil, errors.Wrapf(err, "failed to create table descriptor for statement %s", t)
242243
}

‎pkg/sql/importer/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ go_library(
100100
"@com_github_cockroachdb_errors//:errors",
101101
"@com_github_cockroachdb_logtags//:logtags",
102102
"@com_github_cockroachdb_redact//:redact",
103-
"@com_github_lib_pq//oid",
104103
"@com_github_linkedin_goavro_v2//:goavro",
105104
],
106105
)
@@ -162,7 +161,6 @@ go_test(
162161
"//pkg/sql",
163162
"//pkg/sql/catalog",
164163
"//pkg/sql/catalog/bootstrap",
165-
"//pkg/sql/catalog/catpb",
166164
"//pkg/sql/catalog/descpb",
167165
"//pkg/sql/catalog/descs",
168166
"//pkg/sql/catalog/tabledesc",

‎pkg/sql/importer/bench_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ func toTableDescriptor(
6363
parentID := descpb.ID(keys.SystemDatabaseID)
6464
testSettings := cluster.MakeTestingClusterSettings()
6565
tableDesc, err := importer.MakeTestingSimpleTableDescriptor(
66-
ctx, &semaCtx, testSettings, createTable, parentID, keys.PublicSchemaID, tableID, importer.NoFKs, ts.UnixNano())
66+
ctx, &semaCtx, testSettings, createTable, parentID, keys.PublicSchemaID, tableID, ts.UnixNano(),
67+
)
6768
if err != nil {
6869
return nil, err
6970
}

‎pkg/sql/importer/csv_internal_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@ func TestMakeSimpleTableDescriptorErrors(t *testing.T) {
3030
}{
3131
{
3232
stmt: "create table if not exists a (i int)",
33-
error: "unsupported IF NOT EXISTS",
33+
error: "IF NOT EXISTS is not supported",
3434
},
3535
{
3636
stmt: "create table a as select 1",
37-
error: "CREATE AS not supported",
37+
error: "CREATE AS is not supported",
3838
},
3939
{
4040
stmt: "create table a (i int references b (id))",
41-
error: `this IMPORT format does not support foreign keys`,
41+
error: `foreign keys are not supported`,
4242
},
4343
{
4444
stmt: "create table a (i int, constraint a foreign key (i) references c (id))",
45-
error: `this IMPORT format does not support foreign keys`,
45+
error: `foreign keys are not supported`,
4646
},
4747
{
4848
stmt: "create table a (i int, j int as (i + 10) virtual)",
49-
error: `to import into a table with virtual computed columns, use IMPORT INTO`,
49+
error: `virtual computed columns are not supported`,
5050
},
5151
{
5252
stmt: "create table a (i int, index ((i + 1)))",
53-
error: `to import into a table with expression indexes, use IMPORT INTO`,
53+
error: `expression indexes are not supported`,
5454
},
5555
{
5656
stmt: `create table a (
@@ -81,7 +81,7 @@ func TestMakeSimpleTableDescriptorErrors(t *testing.T) {
8181
if !ok {
8282
t.Fatal("expected CREATE TABLE statement in table file")
8383
}
84-
_, err = MakeTestingSimpleTableDescriptor(ctx, &semaCtx, st, create, parentID, keys.PublicSchemaID, tableID, NoFKs, 0)
84+
_, err = MakeTestingSimpleTableDescriptor(ctx, &semaCtx, st, create, parentID, keys.PublicSchemaID, tableID, 0)
8585
if !testutils.IsError(err, tc.error) {
8686
t.Fatalf("expected %v, got %+v", tc.error, err)
8787
}

‎pkg/sql/importer/import_processor_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -933,14 +933,12 @@ func newTestSpec(
933933
var descr *tabledesc.Mutable
934934
switch format.Format {
935935
case roachpb.IOFileFormat_CSV:
936-
descr = descForTable(ctx, t,
937-
"CREATE TABLE simple (i INT PRIMARY KEY, s text )", 100, 150, 200, NoFKs)
936+
descr = descForTable(ctx, t, "CREATE TABLE simple (i INT PRIMARY KEY, s text )", 100, 150, 200)
938937
case
939938
roachpb.IOFileFormat_MysqlOutfile,
940939
roachpb.IOFileFormat_PgCopy,
941940
roachpb.IOFileFormat_Avro:
942-
descr = descForTable(ctx, t,
943-
"CREATE TABLE simple (i INT PRIMARY KEY, s text, b bytea default null)", 100, 150, 200, NoFKs)
941+
descr = descForTable(ctx, t, "CREATE TABLE simple (i INT PRIMARY KEY, s text, b bytea default null)", 100, 150, 200)
944942
default:
945943
t.Fatalf("Unsupported input format: %v", format)
946944
}

‎pkg/sql/importer/import_stmt_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3235,7 +3235,7 @@ func BenchmarkCSVConvertRecord(b *testing.B) {
32353235
semaCtx := tree.MakeSemaContext(nil /* resolver */)
32363236
evalCtx := eval.MakeTestingEvalContext(st)
32373237

3238-
tableDesc, err := MakeTestingSimpleTableDescriptor(ctx, &semaCtx, st, create, descpb.ID(100), keys.PublicSchemaIDForBackup, descpb.ID(100), NoFKs, 1)
3238+
tableDesc, err := MakeTestingSimpleTableDescriptor(ctx, &semaCtx, st, create, descpb.ID(100), keys.PublicSchemaIDForBackup, descpb.ID(100), 1)
32393239
if err != nil {
32403240
b.Fatal(err)
32413241
}
@@ -4191,7 +4191,7 @@ func BenchmarkDelimitedConvertRecord(b *testing.B) {
41914191
semaCtx := tree.MakeSemaContext(nil /* resolver */)
41924192
evalCtx := eval.MakeTestingEvalContext(st)
41934193

4194-
tableDesc, err := MakeTestingSimpleTableDescriptor(ctx, &semaCtx, st, create, descpb.ID(100), keys.PublicSchemaIDForBackup, descpb.ID(100), NoFKs, 1)
4194+
tableDesc, err := MakeTestingSimpleTableDescriptor(ctx, &semaCtx, st, create, descpb.ID(100), keys.PublicSchemaIDForBackup, descpb.ID(100), 1)
41954195
if err != nil {
41964196
b.Fatal(err)
41974197
}
@@ -4294,8 +4294,7 @@ func BenchmarkPgCopyConvertRecord(b *testing.B) {
42944294
st := cluster.MakeTestingClusterSettings()
42954295
evalCtx := eval.MakeTestingEvalContext(st)
42964296

4297-
tableDesc, err := MakeTestingSimpleTableDescriptor(ctx, &semaCtx, st, create, descpb.ID(100), keys.PublicSchemaIDForBackup,
4298-
descpb.ID(100), NoFKs, 1)
4297+
tableDesc, err := MakeTestingSimpleTableDescriptor(ctx, &semaCtx, st, create, descpb.ID(100), keys.PublicSchemaIDForBackup, descpb.ID(100), 1)
42994298
if err != nil {
43004299
b.Fatal(err)
43014300
}

0 commit comments

Comments
 (0)