Skip to content
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

[fix] (compile) Resolve time_point type mismatch in s3_rate_limiter.cpp in mac #38036

Merged
merged 2 commits into from
Jul 18, 2024

Conversation

Tech-Circle-48
Copy link
Contributor

@Tech-Circle-48 Tech-Circle-48 commented Jul 18, 2024

Proposed changes

Issue Number: close #xxx

A compilation error in s3_rate_limiter.cpp due to a type mismatch between std::chrono::system_clock::time_point and std::chrono::high_resolution_clock::time_point,Updated the _update_remain_token function to accept std::chrono::high_resolution_clock::time_point instead of std::chrono::system_clock::time_point on MacOS。

@doris-robot
Copy link

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

@Tech-Circle-48
Copy link
Contributor Author

run buildall

Copy link
Contributor

PR approved by anyone and no changes requested.

@Tech-Circle-48 Tech-Circle-48 changed the title [fix] (compile) Resolve time_point type mismatch in s3_rate_limiter.cpp [fix] (compile) Resolve time_point type mismatch in s3_rate_limiter.cpp in mac Jul 18, 2024
Copy link
Member

@zy-kkk zy-kkk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jul 18, 2024
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@zy-kkk zy-kkk merged commit 91b2030 into apache:master Jul 18, 2024
28 of 31 checks passed
zy-kkk added a commit that referenced this pull request Jul 18, 2024
…38049)

revert #38036
We cannot change the time_point type directly, but use macros to
distinguish different compilation platforms, refer to #34054
dataroaring pushed a commit that referenced this pull request Jul 19, 2024
…pp in mac (#38036)

A compilation error in `s3_rate_limiter.cpp` due to a type mismatch
between `std::chrono::system_clock::time_point` and
`std::chrono::high_resolution_clock::time_point`,Updated the
`_update_remain_token` function to accept
`std::chrono::high_resolution_clock::time_point` instead of
`std::chrono::system_clock::time_point` on MacOS。
dataroaring pushed a commit that referenced this pull request Jul 19, 2024
…38049)

revert #38036
We cannot change the time_point type directly, but use macros to
distinguish different compilation platforms, refer to #34054
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by one committer. dev/3.0.1-merged reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants