Fix schema timestamps used when loading enumerations from REST. #5291
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
+ Fix error by using current schema's timestamps when loading enumerations from REST.
KiterLuc
reviewed
Sep 9, 2024
| /** Handle `struct` for API ArraySchema objects. */ | ||
| struct tiledb_array_schema_handle_t | ||
| : public tiledb::api::CAPIHandle<tiledb_array_schema_handle_t> { | ||
| /** Type name */ | ||
| static constexpr std::string_view object_type_name{"array_schema"}; | ||
|
|
||
| private: | ||
| using array_schema_type = shared_ptr<ArraySchema>; | ||
| using array_schema_type = shared_ptr<tiledb::sm::ArraySchema>; |
There was a problem hiding this comment.
Could you explain why we now need to fully qualify tiledb::sm classes now?
There was a problem hiding this comment.
Oops, meant to add a comment for this on my PR. It was namespace pollution with using tiledb::sm at the top of this file. When I included this header it makes tiledb::Array and tiledb::sm::Array ambiguous for example.
ypatia
approved these changes
Sep 9, 2024
|
/backport to release-2.26 |
|
Started backporting to release-2.26: https://github.com/TileDB-Inc/TileDB/actions/runs/10773738557 |
|
@KiterLuc backporting to release-2.26 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Add REST test.
Using index info to reconstruct a base tree...
A tiledb/api/c_api/array_schema/array_schema_api.cc
A tiledb/api/c_api/array_schema/array_schema_api_internal.h
M tiledb/sm/array/array.cc
Falling back to patching base and 3-way merge...
Auto-merging tiledb/sm/array/array.cc
CONFLICT (modify/delete): tiledb/api/c_api/array_schema/array_schema_api_internal.h deleted in HEAD and modified in Add REST test.. Version Add REST test. of tiledb/api/c_api/array_schema/array_schema_api_internal.h left in tree.
CONFLICT (modify/delete): tiledb/api/c_api/array_schema/array_schema_api.cc deleted in HEAD and modified in Add REST test.. Version Add REST test. of tiledb/api/c_api/array_schema/array_schema_api.cc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add REST test.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@KiterLuc an error occurred while backporting to release-2.26, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
KiterLuc
pushed a commit
that referenced
this pull request
Sep 9, 2024
…rations from REST. (#5291) (#5293) Backport of #5291 to release-2.26. --- TYPE: NO_HISTORY DESC: Fix schema timestamps used when loading enumerations from REST. --------- Co-authored-by: Ypatia Tsavliri <[email protected]>
shaunrd0
added a commit
that referenced
this pull request
Oct 17, 2024
This fixes a performance regression added in #5291 while loading enumerations for all array schemas. The regression impacts arrays with multiple evolved schemas. Previously #5291 introduced a loop over REST requests for-each schema, this PR loads all enumerations for all schemas in a single request. --- TYPE: C_API DESC: Introduce tiledb_array_load_enumerations_all_schemas TYPE: CPP_API DESC: Introduce ArrayExperimental::load_enumerations_all_schemas --------- Co-authored-by: Ypatia Tsavliri <[email protected]>
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 fixes a bug loading enumerations after a REST request was made using array directory timestamp ranges. The response from the request gives the enumerations on the latest schema in that range, which can result in attempting to store enumerations on a schema where they no longer exist after being dropped in a previous array schema evolution.
Thanks @johnkerl for reporting, in the end I found the exact error from your issue was thrown because the enumeration happened to have the same name as a previously dropped enumeration. I was able to reproduce your error in the test case I added here by evolving the schema a third time to add back an enumeration with an identical name of one that was previously dropped.
TYPE: NO_HISTORY
DESC: Fix schema timestamps used when loading enumerations from REST.