Skip to content

Merge upstream changes up to commit d3456309 #413

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

Merged
merged 6 commits into from
Apr 4, 2025

Conversation

illia-li
Copy link

Original commit list:
1. apache@3a475c7
Message:

CASSGO-44: keep nil slices in MapScan
Previously if you read a NULL column as a varchar using MapScan it
would store the value []byte{} in the map rather than []byte() which
made it impossible to know if the value was NULL or not.

Patch by James Hartig; reviewed by João Reis for CASSGO-44

Status: APPLIED

2. apache@c63468d
Message:

CASSGO-42: don't panic if no applied column is returned
I also added checks against MapScan failing which could also trigger this bug.

Several integration tests were added to validate various edge cases.

Patch by James Hartig; reviewed by João Reis for CASSGO-42

Status: APPLIED

3. apache@91cbf12
Message:

skip metadata only if prepared result included metadata
If the prepare result doesn't include metadata we shouldn't skip metadata
when executing the query. Fixes CASSGO-40.

Patch by James Hartig; reviewed by João Reis for CASSGO-40

Status: APPLIED

4. apache@16366d4
Message:

Improve error messages for marshalling
Enhancement for marshal/unmarshal error messages.
Errors were updated by the supported types list.

patch by Oleksandr Luzhniy; reviewed by João Reis, James Hartig, Bohdan Siryk, for [CASSGO-38](https://issues.apache.org/jira/browse/CASSGO-38)

Status: APPLIED

5. apache@d345630
Message:

CASSGO-2 Marshal big int returns variable length slice.
The marshalBigInt return 8 bytes slice in all cases except for big.Int,
which returns a variable length slice, but should be 8 bytes slice as well.

patch by Mykyta Oleksiienko; reviewed by João Reis, James Harting for CASSGO-2

Status: APPLIED

jameshartig and others added 5 commits January 30, 2025 09:21
Previously if you read a NULL column as a varchar using MapScan it
would store the value []byte{} in the map rather than []byte() which
made it impossible to know if the value was NULL or not.

Patch by James Hartig; reviewed by João Reis for CASSGO-44
I also added checks against MapScan failing which could also trigger this bug.

Several integration tests were added to validate various edge cases.

Patch by James Hartig; reviewed by João Reis for CASSGO-42
If the prepare result doesn't include metadata we shouldn't skip metadata
when executing the query. Fixes CASSGO-40.

Patch by James Hartig; reviewed by João Reis for CASSGO-40
Enhancement for marshal/unmarshal error messages.
Errors were updated by the supported types list.

patch by Oleksandr Luzhniy; reviewed by João Reis, James Hartig, Bohdan Siryk, for CASSGO-38
The marshalBigInt return 8 bytes slice in all cases except for big.Int,
which returns a variable length slice, but should be 8 bytes slice as well.

patch by Mykyta Oleksiienko; reviewed by João Reis, James Harting for CASSGO-2
@illia-li illia-li force-pushed the il/upsteam_update_to_d3456309 branch from 864e87c to e7bae90 Compare April 4, 2025 16:13
@dkropachev dkropachev merged commit 8c6141e into scylladb:master Apr 4, 2025
2 checks passed
@illia-li illia-li deleted the il/upsteam_update_to_d3456309 branch April 4, 2025 20:23
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.

5 participants