Skip to content

multi-region syntax diagrams#65342

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
ericharmeling:multi-region-syntax-diagrams
Jun 7, 2021
Merged

multi-region syntax diagrams#65342
craig[bot] merged 2 commits intocockroachdb:masterfrom
ericharmeling:multi-region-syntax-diagrams

Conversation

@ericharmeling
Copy link
Copy Markdown

@ericharmeling ericharmeling commented May 17, 2021

  • Updated ALTER/CREATE DATABASE diagrams for multi-region
  • Updated CREATE TABLE diagram for multi-region
  • Added opt_locality diagram

Release note: None

@ericharmeling ericharmeling requested a review from ajstorm May 17, 2021 17:55
@cockroach-teamcity
Copy link
Copy Markdown
Member

cockroach-teamcity commented May 17, 2021

This change is Reviewable

@ericharmeling ericharmeling requested a review from RichardJCai May 17, 2021 20:18
@ericharmeling
Copy link
Copy Markdown
Author

ericharmeling commented Jun 3, 2021

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 3, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 3, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 3, 2021

Build failed (retrying...):

@RichardJCai
Copy link
Copy Markdown
Contributor

RichardJCai commented Jun 3, 2021

I think you can just re bors this

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 3, 2021

Build failed:

@RichardJCai
Copy link
Copy Markdown
Contributor

RichardJCai commented Jun 3, 2021 •
edited
Loading 

[21:48:02]	[Ensure generated code is up-to-date] index ce189fa4c4..0000000000
[21:48:02]	[Ensure generated code is up-to-date] --- a/docs/generated/sql/bnf/alter_database_drop_region_stmt.bnf
[21:48:02]	[Ensure generated code is up-to-date] +++ /dev/null
[21:48:02]	[Ensure generated code is up-to-date] @@ -1,3 +0,0 @@
[21:48:02]	[Ensure generated code is up-to-date] -alter_database_drop_region_stmt ::=
[21:48:02]	[Ensure generated code is up-to-date] -	'ALTER' 'DATABASE' database_name 'DROP' 'REGION' region_name
[21:48:02]	[Ensure generated code is up-to-date] -	| 'ALTER' 'DATABASE' database_name 'DROP' 'REGION' 'IF' 'EXISTS' region_name
[21:48:02]	[Ensure generated code is up-to-date] diff --git a/docs/generated/sql/bnf/alter_database_primary_region_stmt.bnf b/docs/generated/sql/bnf/alter_database_primary_region_stmt.bnf
[21:48:02]	[Ensure generated code is up-to-date] deleted file mode 100644
[21:48:02]	[Ensure generated code is up-to-date] index 609857d8ab..0000000000
[21:48:02]	[Ensure generated code is up-to-date] --- a/docs/generated/sql/bnf/alter_database_primary_region_stmt.bnf
[21:48:02]	[Ensure generated code is up-to-date] +++ /dev/null
[21:48:02]	[Ensure generated code is up-to-date] @@ -1,2 +0,0 @@
[21:48:02]	[Ensure generated code is up-to-date] -alter_database_primary_region_stmt ::=
[21:48:02]	[Ensure generated code is up-to-date] -	'ALTER' 'DATABASE' database_name primary_region_clause
[21:48:02]	[Ensure generated code is up-to-date] ====================================================
[21:48:02]	[Ensure generated code is up-to-date] Some automatically generated code is not up to date.
[21:48:02]	[Ensure generated code is up-to-date] Run `make generate` to automatically regenerate these.
[21:48:02]	[Ensure generated code is up-to-date] Process exited with code 1

Nvm looks like theres a merge conflict, running make generate should fix it, just regen the docs.

Eric Harmeling added 2 commits June 4, 2021 10:52
multi-region syntax diagrams
e113f76 
- Updated ALTER/CREATE DATABASE diagrams for multi-region
- Updated CREATE TABLE diagram for multi-region
- Added opt_locality diagram

Release note: None
BNFs regenerated
c7e5259 
Release note: None
@ericharmeling ericharmeling force-pushed the multi-region-syntax-diagrams branch from a86b9d0 to c7e5259 Compare June 4, 2021 16:43
@ericharmeling
Copy link
Copy Markdown
Author

ericharmeling commented Jun 7, 2021

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 7, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jun 7, 2021

Build succeeded:

@craig craig bot merged commit 46ef251 into cockroachdb:master Jun 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ajstorm ajstorm Awaiting requested review from ajstorm

1 more reviewer

@RichardJCai RichardJCai RichardJCai approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ericharmeling @cockroach-teamcity @RichardJCai