crosscluster/logical: handle user-defined types in SQL mode #133280
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
rafiss
commented
Oct 23, 2024
rafiss
force-pushed
the
ldr-udt-hydration
branch
from
84b7479 to
9b8ac45
Compare
msbutler
approved these changes
Oct 23, 2024
| @@ -211,16 +210,9 @@ func createLogicalReplicationStreamPlanHook( | |||
|
|
|||
| sourceTypes := make([]*descpb.TypeDescriptor, len(spec.TypeDescriptors)) | |||
| for i, desc := range spec.TypeDescriptors { | |||
| // Until https://github.com/cockroachdb/cockroach/issues/132164 is resolved, | |||
| // we cannot allow user-defined types on the SQL ingestion path. | |||
There was a problem hiding this comment.
i think this little block of code should be in the previous commit.
| @@ -92,6 +92,9 @@ func (q *queryBuilder) AddRow(row cdcevent.Row) error { | |||
| } | |||
| if err := it.Datum(func(d tree.Datum, col cdcevent.ResultColumn) error { | |||
| if dEnum, ok := d.(*tree.DEnum); ok { | |||
| // Override the type to Unknown to avoid a mismatched type OID error | |||
| // during execution. Note that Unknown is the type used by default | |||
There was a problem hiding this comment.
the diff in this file should be in the previous commit.
Previously, using a user-defined type in SQL mode would fail because of a low level check in the execution engine that verifies that the input datum has the same type OID as the destination column. This does not work for LDR, since the input datums come directly from a source table in a different cluster, so user-defined types have different OIDs. This fixes it by setting the datum type to "unknown" before executing the insert query. The "unknown" type is what is normally used when any SQL statement is sent to CRDB without explicit type annotations/hints. When the execution engine sees this type, it will perform an automatic (and cheap) immutable assignment cast to change the datum to the appropriate type. Release note (ops change): Logical replication streams that reference tables with user-defined types can now be created with the `mode = immediate` option.
Since we're using this type resolver for more than just IMPORT, it makes more sense to put it in a more fitting package. Release note: None
rafiss
force-pushed
the
ldr-udt-hydration
branch
from
9b8ac45 to
579ecef
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR also includes a cleanup refactor:
importer,crosscluster: move type resolver to a different package
Since we're using this type resolver for more than just IMPORT, it makes
more sense to put it in a more fitting package.
crosscluster/logical: handle user-defined types in SQL mode
Previously, using a user-defined type in SQL mode would fail because of
a low level check in the execution engine that verifies that the input
datum has the same type OID as the destination column.
This does not work for LDR, since the input datums come directly from a
source table in a different cluster, so user-defined types have
different OIDs.
This fixes it by setting the datum type to "unknown" before executing
the insert query. The "unknown" type is what is normally used when any
SQL statement is sent to CRDB without explicit type annotations/hints.
When the execution engine sees this type, it will perform an automatic
(and cheap) immutable assignment cast to change the datum to the
appropriate type.
fixes #132164
Release note (ops change): Logical replication streams that reference
tables with user-defined types can now be created with the
mode = immediateoption.