CNDB-16697 Port CNBD-16135 79f25c7cf0 to main-5.0#2242
CNDB-16697 Port CNBD-16135 79f25c7cf0 to main-5.0#2242
Conversation
…2150) CNDB-16135: Descriptor uses different instances of `Path directory` for the same table as constructor parameter Use the table directory from `Directories` in `Descriptor` as constructor parameter . `Descriptor#directory` is still different instance in C* due to `directory#toCanonical()` which always creates new instance in local file system
Checklist before you submit for review
|
|
@zgorzalyj Apologies, I did not realize the specifics of this porting task - it looked small so I assumed it would be a relatively clean one. However, this an example of a CC That said, I'm not sure I understand the large amount of changes to these files - I did not get the same type of results when I did: The scope of conflicts I got is much smaller. Perhaps it's because I usually do a simple Even so, once I got started looking at the changes it took me more time than expected today, and I wanted to be able to have some response to give. Most of the conflict is in Finally, I decide to start back at the original Sometimes in these porting it's harder to make sense of the cherry-pick merge conflicts and instead switch to a more focused manual porting of code changes. In addition sometimes code from the older With that as a goal, I started from the changes in After some trial/error, I found it was easier to make an alternate change for I pushed a branch, datastax/CNDB-16697-danj, with the result. Take a look at it - see if it makes sense to you and if the explanations manage to make some sense. We can discuss some more next week too. |
https://github.com/riptano/cndb/issues/16697
What is the issue
CNDB-16135: Descriptor uses different instances of `Path directory` for
the same table as constructor parameter
What does this PR fix and why was it fixed
Use the table directory from `Directories` in `Descriptor` as
constructor parameter. `Descriptor#directory` is still different
instance in C* due to `directory#toCanonical()` which always creates new
instance in local file system
Backport notes (main-5.0)
Cherry-picked from commit 79f25c7
Adaptations for main-5.0: