-
Notifications
You must be signed in to change notification settings - Fork 141
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
Update MacOS Version for ODBC Driver #987
Update MacOS Version for ODBC Driver #987
Conversation
…s to be included through vcpkg. Fixed compilation errors with newer compilers on libraries required to build from source. Signed-off-by: forestmvey <forestv@bitquilltech.com>
Update MacOS Version for ODBC Driver
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
I detected ODBC CI failed on main recently: https://github.com/opensearch-project/sql/actions/runs/3396132013 |
Yes, it is not in main. I meant we will need to merge all changes to main together soon. Not only this PR. So probably we just need to back port to 1.x for now? |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-987-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 99cebe349710c6e2f3fecef8ddd1d9be488029c0
# Push it to GitHub
git push --set-upstream origin backport/backport-987-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x Then, create a pull request where the |
…s to be included through vcpkg. Fixed compilation errors with newer compilers on libraries required to build from source. (opensearch-project#987) opensearch-project#987 Signed-off-by: forestmvey <forestv@bitquilltech.com> (cherry picked from commit 99cebe3) Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
[Backport 1.x] Update MacOS Version for ODBC Driver #987
This cherry-picking if intended to sync the ODBC new repo to the existing 2.X state of the unified SQL repo see :: Update MacOS Version for ODBC Driver #987 Origin PR: opensearch-project/sql#987 Done by: https://github.com/forestmvey Signed-off-by: YANGDB <yang.db.dev@gmail.com>
This cherry-picking if intended to sync the ODBC new repo to the existing 2.X state of the unified SQL repo see :: Update MacOS Version for ODBC Driver #987 Origin PR: opensearch-project/sql#987 Done by: https://github.com/forestmvey Signed-off-by: YANGDB <yang.db.dev@gmail.com>
* As part of SQL repo split - ODBC was missing the 2.X branch This cherry-picking if intended to sync the ODBC new repo to the existing 2.X state of the unified SQL repo see :: Update MacOS Version for ODBC Driver #987 Origin PR: opensearch-project/sql#987 Done by: https://github.com/forestmvey Signed-off-by: YANGDB <yang.db.dev@gmail.com> * As part of SQL repo split - ODBC was missing the 2.X branch This cherry-picking if intended to sync the ODBC new repo to the existing 2.X state of the unified SQL repo see :: Update MacOS Version for ODBC Driver #987 Origin PR: opensearch-project/sql#987 Done by: https://github.com/forestmvey Signed-off-by: YANGDB <yang.db.dev@gmail.com> * Adding missing VisualLeakDetector dependencies to resolve windows ODBC compilation. Signed-off-by: forestmvey <forestv@bitquilltech.com> Signed-off-by: YANGDB <yang.db.dev@gmail.com> Signed-off-by: forestmvey <forestv@bitquilltech.com> Co-authored-by: forestmvey <forestv@bitquilltech.com>
Description
Updating MacOS from
10.15
to12
poses compilation issues for librariesaws-sdk-cpp
andgoogletest
. A better solution than building from source is to manage dependencies through a package manager likevcpkg
. Librariesrapidjson
andrabbit
I could not eliminate building from source completely. Windows failed to compile with VS 2022, andrabbit
is not included in vcpkg.Compilation Error Fixes -
VS 2022:
<algorith>
includesstd::string
toAws::String
XCode 13.3:
basic_array(const basic_array& other)
sql-odbc/libraries/rabbit/include/rabbit.hppRemoval of
bindpara_msg_to_utf8
function as it is never used, contains unused variables, and has potential for exploit when executingmalloc(strlen(buff))
with a non-null terminated buffer.Multiple deletions for un-used variables made throughout.
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.