Skip to content

Commit

Permalink
workload: fix partition commands in tpcc import
Browse files Browse the repository at this point in the history
The commands for partitioning indexes in the TPCC import were erroring
out due to a syntax change introduced in cockroachdb#39332. I updated them to use
`ALTER PARTITION ... OF INDEX` rather than `ALTER PARTITION ... OF
TABLE`.

Fixes cockroachdb#39005
Fixes cockroachdb#40360
Fixes cockroachdb#40416

Release note: None
  • Loading branch information
solongordon committed Sep 3, 2019
1 parent 3d8394e commit f56a83d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/workload/tpcc/partition.go
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ func (p *partitioner) randActive(rng *rand.Rand) int {
// default it adds constraints/preferences in terms of racks, but if the zones
// flag is passed into tpcc, it will set the constraints/preferences based on
// the geographic zones provided.
func configureZone(db *gosql.DB, cfg zoneConfig, table, partition string, partIdx int) error {
func configureZone(db *gosql.DB, cfg zoneConfig, obj, name, partition string, partIdx int) error {
var kv string
if len(cfg.zones) > 0 {
kv = fmt.Sprintf("zone=%s", cfg.zones[partIdx])
Expand All @@ -267,8 +267,8 @@ func configureZone(db *gosql.DB, cfg zoneConfig, table, partition string, partId
panic("unexpected")
}

sql := fmt.Sprintf(`ALTER PARTITION %s OF TABLE %s CONFIGURE ZONE USING %s`,
partition, table, opts)
sql := fmt.Sprintf(`ALTER PARTITION %s OF %s %s CONFIGURE ZONE USING %s`,
partition, obj, name, opts)
if _, err := db.Exec(sql); err != nil {
return errors.Wrapf(err, "Couldn't exec %q", sql)
}
Expand Down Expand Up @@ -297,7 +297,7 @@ func partitionObject(
}

for i := 0; i < p.parts; i++ {
if err := configureZone(db, cfg, table, fmt.Sprintf("p%d_%d", idx, i), i); err != nil {
if err := configureZone(db, cfg, obj, name, fmt.Sprintf("p%d_%d", idx, i), i); err != nil {
return err
}
}
Expand Down

0 comments on commit f56a83d

Please sign in to comment.