Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sql: Add default_int_size to control INT alias #32848

Merged
merged 1 commit into from
Dec 12, 2018
Merged

sql: Add default_int_size to control INT alias #32848

merged 1 commit into from
Dec 12, 2018

Conversation

bobvawter
Copy link
Contributor

@bobvawter bobvawter commented Dec 5, 2018

This is a follow-up from #32831 to support #26925.

The combination of default_int_size interacts with
experimental_serial_normalization. Sequence types that are ultimately based
on unique_rowid() must always be INT8 types in order to hold the returned
values. Only in the case where default_int_size=4 experimental_serial_normalization='sql_sequence' will an INT4 column be
created in response to a SERIAL type.

Release note (sql change): A new session variable default_int_size and
cluster setting sql.defaults.default_int_size have been added to control how
the INT and SERIAL types are interpreted. The default value, 8, causes the INT
and SERIAL types to be interpreted as aliases for INT8 and SERIAL8, which have
been the historical defaults for CockroachDB. PostgreSQL clients that expect
INT and SERIAL to be 32-bit values, can set default_int_size to 4, which will
cause INT and SERIAL to be aliases for INT4 and SERIAL4. Please note that due
to issue #32846, SET default_int_size does not take effect until the next
statement batch is executed.

@bobvawter bobvawter requested a review from a team as a code owner December 5, 2018 16:03
@bobvawter bobvawter requested review from a team December 5, 2018 16:03
@bobvawter bobvawter requested a review from a team as a code owner December 5, 2018 16:03
@bobvawter bobvawter requested review from a team December 5, 2018 16:03
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz
Copy link
Contributor

knz commented Dec 6, 2018

please ping me when the other PR merges and this is rebased; I'd prefer to avoid the review until the file list becomes smaller.

Copy link
Contributor Author

@bobvawter bobvawter left a comment

Choose a reason for hiding this comment

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

PTAL: Rebased against master.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

Copy link
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

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

Well done. Just a few minor comments (don't forget to update the release note accordingly).

That said I think some proper treatment of SERIAL is missing here.

Also please emphasize in the release note that this is meant for compatibility with PostgreSQL clients.

Reviewed 13 of 13 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained


pkg/sql/exec_util.go, line 87 at r1 (raw file):

// TODO(bob): Remove or n-op this in v2.4: https://github.com/cockroachdb/cockroach/issues/32844
var defaultIntSize = settings.RegisterValidatedIntSetting(
	"sql.default_int_size",

sql.defaults.xxx_int_size for consistency with other settings

with a suitable word for xxx -- default, base, naked, whatever


pkg/sql/vars.go, line 225 at r1 (raw file):

	// TODO(bob): Remove or no-op this in v2.4: https://github.com/cockroachdb/cockroach/issues/32844
	`default_int_size`: {
		Get: func(evalCtx *extendedEvalContext) string {

Turn this session variable into one configurable using SQL integers; you can follow the model of extra_float_digits.


pkg/sql/parser/parse.go, line 107 at r1 (raw file):

// ParseOne parses a sql statement string, ensuring that it contains only a
// single statement, and returns that Statement.

Please extend the comment to justify the choice of int8


pkg/sql/parser/sql.y, line 6603 at r1 (raw file):

  INT
  {
    $$.val = sqllex.(*scanner).nakedIntType

You need to do something about SERIAL too.

Copy link
Contributor Author

@bobvawter bobvawter left a comment

Choose a reason for hiding this comment

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

PTAL; comments addressed. I think this is doing the right thing w.r.t. expanding a SERIAL column to always fit the unique_rowid() function.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained


pkg/sql/vars.go, line 225 at r1 (raw file):

Previously, knz (kena) wrote…

Turn this session variable into one configurable using SQL integers; you can follow the model of extra_float_digits.

Done. Extracted a common makeIntGetStringValFn() per the existing TODO.


pkg/sql/parser/parse.go, line 107 at r1 (raw file):

Previously, knz (kena) wrote…

Please extend the comment to justify the choice of int8

Done.


pkg/sql/parser/sql.y, line 6603 at r1 (raw file):

Previously, knz (kena) wrote…

You need to do something about SERIAL too.

Done. Extended the test to show that a SERIAL column is expanded to SERIAL8 to accept the result of unique_row_id().

Copy link
Contributor Author

@bobvawter bobvawter left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained


pkg/sql/exec_util.go, line 87 at r1 (raw file):

Previously, knz (kena) wrote…

sql.defaults.xxx_int_size for consistency with other settings

with a suitable word for xxx -- default, base, naked, whatever

Done.

Copy link
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

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

The behavior you observe here with default_int_size = 4 and SERIAL going to INT8 is OK if and only if you also include a test that demonstrates/exercises that default_int_size = 4 + experimental_serial_normalization = sql_sequence makes SERIAL go to INT4.

You may then want to add a markdown table in the commit message to enumerate exhaustively what SERIAL expands to depending on the values of default_int_size and serial_normalization.

PR LGTM after that.

Reviewed 6 of 6 files at r2.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

This is a follow-up from #32831 to support #26925.

The combination of `default_int_size` interacts with
`experimental_serial_normalization`. Sequence types that are ultimately based
on `unique_rowid()` must always be INT8 types in order to hold the returned
values.  Only in the case where `default_int_size=4
experimental_serial_normalization='sql_sequence'` will an INT4 column be
created in response to a SERIAL type.

Release note (sql change): A new session variable `default_int_size` and
cluster setting `sql.defaults.default_int_size` have been added to control how
the INT and SERIAL types are interpreted. The default value, 8, causes the INT
and SERIAL types to be interpreted as aliases for INT8 and SERIAL8, which have
been the historical defaults for CockroachDB.  PostgreSQL clients that expect
INT and SERIAL to be 32-bit values, can set `default_int_size` to 4, which will
cause INT and SERIAL to be aliases for INT4 and SERIAL4.  Please note that due
to issue #32846, `SET default_int_size` does not take effect until the next
statement batch is executed.
@bobvawter
Copy link
Contributor Author

bors r+

craig bot pushed a commit that referenced this pull request Dec 12, 2018
32848: sql: Add default_int_size to control INT alias r=bobvawter a=bobvawter

This is a follow-up from #32831 to support #26925.

The combination of `default_int_size` interacts with
`experimental_serial_normalization`. Sequence types that are ultimately based
on `unique_rowid()` must always be INT8 types in order to hold the returned
values.  Only in the case where `default_int_size=4
experimental_serial_normalization='sql_sequence'` will an INT4 column be
created in response to a SERIAL type.

Release note (sql change): A new session variable `default_int_size` and
cluster setting `sql.defaults.default_int_size` have been added to control how
the INT and SERIAL types are interpreted. The default value, 8, causes the INT
and SERIAL types to be interpreted as aliases for INT8 and SERIAL8, which have
been the historical defaults for CockroachDB.  PostgreSQL clients that expect
INT and SERIAL to be 32-bit values, can set `default_int_size` to 4, which will
cause INT and SERIAL to be aliases for INT4 and SERIAL4.  Please note that due
to issue #32846, `SET default_int_size` does not take effect until the next
statement batch is executed.



Co-authored-by: Bob Vawter <[email protected]>
@craig
Copy link
Contributor

craig bot commented Dec 12, 2018

Build succeeded

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