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 array of JSON type to pre-constructed types #75550

Merged
merged 1 commit into from
Jan 26, 2022

Conversation

xinhaoz
Copy link
Member

@xinhaoz xinhaoz commented Jan 26, 2022

This commit adds the JSONArray type to the preconstructed list of types
for use in bultin function definition.

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@xinhaoz xinhaoz requested review from a team January 26, 2022 16:01
@rafiss
Copy link
Collaborator

rafiss commented Jan 26, 2022

nice, thanks! I think this might fix the error that came up here #74078 (comment)

Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

lgtm after fixing nits

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @rafiss and @xinhaoz)


-- commits, line 4 at r1:
nit: typo in preconstructed


docs/generated/sql/functions.md, line 328 at r1 (raw file):

<tr><td><a name="crdb_internal.merge_statement_stats"></a><code>crdb_internal.merge_statement_stats(input: jsonb[]) &rarr; jsonb</code></td><td><span class="funcdesc"><p>Merge an array of roachpb.StatementStatistics into a single JSONB object</p>
</span></td></tr>
<tr><td><a name="crdb_internal.merge_transaction_stats"></a><code>crdb_internal.merge_transaction_stats(input: anyelement[]) &rarr; jsonb</code></td><td><span class="funcdesc"><p>Merge an array of roachpb.TransactionStatistics into a single JSONB object</p>

i think you need to run make buildshort to update these auto generated docs

This commit adds the JSONArray type to the preconstructed list of types
for use in bultin function definition.

Release note: None
@xinhaoz xinhaoz force-pushed the check-type-in-stats-merging branch from 8da7d19 to 61a1ba0 Compare January 26, 2022 19:11
Copy link

@THardy98 THardy98 left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 3 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @xinhaoz)

LGTM :)

@xinhaoz
Copy link
Member Author

xinhaoz commented Jan 26, 2022

TFTR!
bors r+

@craig
Copy link
Contributor

craig bot commented Jan 26, 2022

Build succeeded:

@craig craig bot merged commit b64fe37 into cockroachdb:master Jan 26, 2022
@xinhaoz xinhaoz deleted the check-type-in-stats-merging branch March 23, 2022 18:48
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.

4 participants