Fix amalgamation and distribution test setup #152
Merged
Conversation
This file contains hidden or 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
…ntf functions of benchmarks
…er.h and used include only in advance query c file
…hub.com/ubco-db/EmbedDB into 150-fix-the-test_sort-failing-unit-test
…nd workflow dist updates
xelArga
changed the title
Contributor
Contributor
…hub.com/ubco-db/EmbedDB into 150-fix-the-test_sort-failing-unit-test
rlawrenc
approved these changes
Oct 20, 2025
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.
Description
This PR addresses the issue with amalgamation, and the subsequent problems that came from the sorting tests with the distribution files.
What was changed
Amalgamation.py
A method in the amalgamation process was blindly adding .c files to corresponding headers, even when they weren't there. It now does a check to make sure it's actually in the source file nodes, as the external_sort.h file is used as a wrapper of sorts for external sort methods, and has no corresponding .c file pair.
Makefile
I updated the flags for the dist build to include the /src as for some reason it wasn't retrieving the active rules and other imports correctly for make on windows (it worked on WSL or Linux just fine).
Tests
The test sort query didn't have the proper macro definitions for DIST testing as done in other test methods, so I did so as done in others. I also moved the setup to the
setup()method and the tear down to thetearDown()method as consistent with other tests. I also noticed this test has a second similar test that isn't even run, which could be addressed down the line.The same macro issue was in the in memory sort test as well, and the macros were updated.
Workflow
I updated the dist workflow to be like the desktop version to not run in matrix so the flags work as expected for windows as they did on desktop.