Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
79175: sql: collect contention stats for sql stats when tracing is enabled r=yuzefovich a=Azhng

Resolves #78675

Previously, contention stats was not collected for SQL Stats even when
tracing was enabled. This was caused by two bugs:
1. instrumentationHelper skipping analyzing traces when tracing is enabled
2. transaction statistics ignore traces when tracing is turned on at the
higher level.

This commit ensures that contention stats is collected when tracing is
turned on.

Release note (bug fix): Contention statistics are now being collected for
SQL Stats when tracing is enabled.

79606: sql/pgwire: add sql.conn.failures metric r=maryliag a=Azhng

Related to #73566

This commit adds the the new sql.conn.failures counter metric that
reflects the number of failed SQL connections.

Release note (sql change): the new sql.conn.failures counter metric shows
number of failed SQL connections.

79670: Updates to restore & backup sql diagrams r=ericharmeling a=kathancox

Release note: None

79772: ui: fix raft messages graph r=Santamaura a=Santamaura

Previously, when a user attempted to drag-to-zoom on the graph or use
the date picker it would not work properly. This is due to missing props
that set the time window and the time scale. Therefore, this patch
updates the props to include these in order to have the date picker and
graph drag-to-zoom working again.

resolves #79614

Release note (bug fix): Update props on the raft messages page to
include functions to set the time window and time scale in order
to fix date picker and drag-to-zoom functionality.

Co-authored-by: Azhng <[email protected]>
Co-authored-by: Kathryn Hancox <[email protected]>
Co-authored-by: Santamaura <[email protected]>
  • Loading branch information
4 people committed Apr 11, 2022
5 parents cbbfe24 + 3b896b4 + 6914cc7 + 70bec91 + 1de4532 commit 3582a90
Show file tree
Hide file tree
Showing 13 changed files with 129 additions and 62 deletions.
2 changes: 1 addition & 1 deletion docs/generated/sql/bnf/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FILES = [
"add_column",
"add_constraint",
"alter_changefeed",
"alter_backup_stmt",
"alter_backup",
"alter_column",
"alter_database_add_region_stmt",
"alter_database_add_super_region",
Expand Down
3 changes: 3 additions & 0 deletions docs/generated/sql/bnf/alter_backup.bnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
alter_backup_stmt ::=
'ALTER' 'BACKUP' ( 'LATEST' | subdirectory ) 'IN' collectionURI 'ADD' 'NEW_KMS' kmsURI 'WITH' 'OLD_KMS' kmsURI
| 'ALTER' 'BACKUP' ( 'LATEST' | subdirectory ) 'IN' collectionURI 'ADD' 'NEW_KMS' kmsURI 'WITH' 'OLD_KMS' kmsURI
3 changes: 0 additions & 3 deletions docs/generated/sql/bnf/alter_backup_stmt.bnf

This file was deleted.

12 changes: 6 additions & 6 deletions docs/generated/sql/bnf/backup.bnf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
backup_stmt ::=
'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' backup_options ( ( ',' backup_options ) )*
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' backup_options ( ( ',' backup_options ) )* ')'
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' backup_options ( ( ',' backup_options ) )*
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' 'OPTIONS' '(' backup_options ( ( ',' backup_options ) )* ')'
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' )
'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' backup_options ( ( ',' backup_options ) )*
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' backup_options ( ( ',' backup_options ) )* ')'
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' backup_options ( ( ',' backup_options ) )*
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' 'OPTIONS' '(' backup_options ( ( ',' backup_options ) )* ')'
| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )
72 changes: 36 additions & 36 deletions docs/generated/sql/bnf/restore.bnf
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
restore_stmt ::=
'RESTORE' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' restore_options_list
| 'RESTORE' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' )
| 'RESTORE' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' restore_options_list
| 'RESTORE' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' )
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' restore_options_list
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' )
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' restore_options_list
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' )
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' restore_options_list
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' )
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' restore_options_list
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' subdirectory 'IN' ( destination | '(' partitioned_backup_location ( ',' partitioned_backup_location )* ')' )
'RESTORE' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' restore_options_list
| 'RESTORE' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )
| 'RESTORE' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' restore_options_list
| 'RESTORE' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' restore_options_list
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' restore_options_list
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' ( 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' restore_options_list
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' restore_options_list
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' restore_options_list
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'WITH' 'OPTIONS' '(' restore_options_list ')'
| 'RESTORE' 'SYSTEM' 'USERS' 'FROM' ( ( subdirectory | 'LATEST' ) ) 'IN' ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )
Loading

0 comments on commit 3582a90

Please sign in to comment.