Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
40943: sql: remove unimplemented error message from COMMENT ON statement r=arulajmani a=arulajmani

Any syntax error while using the COMMENT ON statement returns an error
referencing cockroachdb#19472. With cockroachdb#19472 closed, we should no longer reference
it when the syntax is wrong.

Fixes cockroachdb#40713

Release note: None

Release Justification: Very minor change

40944: roachtest: tpcc-max had too low of a timeout r=jordanlewis a=jordanlewis

It's supposed to run for 6 days, but used the default timeout of 10
hours.

Closes cockroachdb#38558.

Release note: None
Release justification: test-only change

Co-authored-by: Arul Ajmani <arula@cockroachlabs.com>
Co-authored-by: Jordan Lewis <jordanthelewis@gmail.com>
  • Loading branch information
3 people committed Sep 20, 2019
3 parents 4d722a9 + 7979cf1 + 2fd18e8 commit 1adb5d7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
1 change: 1 addition & 0 deletions pkg/cmd/roachtest/tpcc.go
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ func registerTPCC(r *testRegistry) {
MinVersion: maybeMinVersionForFixturesImport(cloud),
Tags: []string{`weekly`},
Cluster: makeClusterSpec(4, cpu(16)),
Timeout: time.Duration(6*24)*time.Hour + time.Duration(10)*time.Minute,
Run: func(ctx context.Context, t *test, c *cluster) {
warehouses := 1350
runTPCC(ctx, t, c, tpccOptions{
Expand Down
4 changes: 0 additions & 4 deletions pkg/sql/parser/sql.y
Original file line number Diff line number Diff line change
Expand Up @@ -2166,10 +2166,6 @@ comment_stmt:

$$.val = &tree.CommentOnColumn{ColumnItem: columnItem, Comment: $6.strPtr()}
}
| COMMENT ON error
{
return unimplementedWithIssue(sqllex, 19472)
}

comment_text:
SCONST
Expand Down

0 comments on commit 1adb5d7

Please sign in to comment.