Skip to content

roachtest: update version map and create fixtures#50770

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
asubiotto:rvrn
Jun 30, 2020
Merged

roachtest: update version map and create fixtures#50770
craig[bot] merged 1 commit intocockroachdb:masterfrom
asubiotto:rvrn

Conversation

@asubiotto
Copy link
Copy Markdown
Contributor

This commit adds the recently released 19.1.10, 19.2.8, and 20.1.3 to the
version map in PredecessorVersion.

Release note: None (testing change)

This commit adds the recently released 19.1.10, 19.2.8, and 20.1.3 to the
version map in PredecessorVersion.

Release note: None (testing change)
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

This was referenced Jun 29, 2020
Copy link
Copy Markdown
Collaborator

@jlinder jlinder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are all the checkpoint fixtures updated in this PR? Is this something that should be happening every time the version map gets changed?

@asubiotto
Copy link
Copy Markdown
Contributor Author

Yes, according to this comment:

	// NB: you can update the values in this map to point at newer patch
	// releases. You will need to run acceptance/version-upgrade with the
	// checkpoint option enabled to create the missing store directory fixture
	// (see runVersionUpgrade). The same is true for adding a new key to this
	// map.

@jlinder
Copy link
Copy Markdown
Collaborator

jlinder commented Jun 30, 2020

Hrm. I see. Then we've been missing that step for a while.

Copy link
Copy Markdown
Collaborator

@jlinder jlinder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@asubiotto
Copy link
Copy Markdown
Contributor Author

bors r=jlinder

craig bot pushed a commit that referenced this pull request Jun 30, 2020
50709: sql,execinfrapb: DistSQLPlanner and related changes for inverted join r=sumeerbhola a=sumeerbhola

Release note: None

50760: backupccl: fix formatting of backup jobs in jobs table r=pbardea a=pbardea

When adding cluster backup/restore, the method which generated the job
description was not updated to handle cluster backups. Previously, a
cluster backup job would appear in the jobs table as `BACKUP TABLE TO`
rather than `BACKUP TO`.

Release note (bug fix): Cluster backup would previously appear as
`BACKUP TABLE TO` rather than `BACKUP TO` in the jobs table.

50770: roachtest: update version map and create fixtures r=jlinder a=asubiotto

This commit adds the recently released 19.1.10, 19.2.8, and 20.1.3 to the
version map in PredecessorVersion.

Release note: None (testing change)

50815: opt: fix ResolvedType() for aggregateInfo in the optbuilder r=rytaft a=rytaft

Prior to this commit, it was possible that calling `ResolvedType()`
on an `aggregateInfo` object returned the wrong type. This was because
`aggregateInfo` did not implement `ResolvedType()`, and was therefore
passing the call to the embedded `tree.FuncExpr`, which may have been
stripped of its original type information. This commit fixes the
problem by adding an implementation of `ResolvedType()` to `aggregateInfo`,
which simply returns the type of the aggregation column represented by
the struct.

Fixes #46914

Release note (bug fix): Fixed an internal error that could happen
during planning for some queries with aggregate functions embedded in
complex scalar expressions.

Co-authored-by: sumeerbhola <sumeer@cockroachlabs.com>
Co-authored-by: Paul Bardea <pbardea@gmail.com>
Co-authored-by: Alfonso Subiotto Marques <alfonso@cockroachlabs.com>
Co-authored-by: Rebecca Taft <becca@cockroachlabs.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 30, 2020

Build failed (retrying...)

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 30, 2020

Build succeeded

@craig craig bot merged commit a6a58f4 into cockroachdb:master Jun 30, 2020
@asubiotto asubiotto deleted the rvrn branch August 3, 2020 12:29
@asubiotto
Copy link
Copy Markdown
Contributor Author

If anyone is reading this PR after the fact and wondering how I did it, a crucial step is to run the roachtest using the --local flag.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants