Avoid clock_gettime on pre-10.12 macOS versions #39
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
On older macOS like 10.10 we saw the following compiler error:
```
/go/src/github.com/cockroachdb/cockroach/c-deps/rocksdb/env/env_posix.cc:845:19:
error: use of undeclared identifier 'CLOCK_THREAD_CPUTIME_ID'
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
^
```
According to mac's `man clock_gettime`: "These functions first appeared in Mac
OSX 10.12". So we should not try to compile it on earlier versions.
Test Plan: verified it compiles now on 10.10. Also did some investigation to
ensure it does not cause regression on macOS 10.12+, although I do not
have access to such an environment to really test.
|
Upstream PR is facebook#5570. |
ajkr
added a commit
to ajkr/cockroach
that referenced
this pull request
Jul 16, 2019
Pick up cockroachdb/rocksdb#39 Release note: None
craig bot
pushed a commit
to cockroachdb/cockroach
that referenced
this pull request
Jul 16, 2019
38767: exec: fix planning of count operator r=yuzefovich a=yuzefovich Previously, when planning a count operator, we would add it to the flow and would ignore any post-operator planning (like projections). Now, this is fixed. Additionally, this commit fixes slicing within projections operators - previously, we would always slice up to BatchSize, but the underlying memory not always has sufficient capacity (for example, count operator uses a batch with a capacity of 1) which would cause an index out of bounds. Fixes: #38752. Release note: None 38881: exec: fix NaN comparison logic r=solongordon a=solongordon I added special NaN handling for float comparisons. In SQL, NaNs are treated as less than any other float value. Thankfully I'm not seeing a performance hit when I run our sort benchmarks with float64 values. Fixes #38751 Release note: None 38891: c-deps: bump rocksdb for macOS build fix r=ajkr a=ajkr Pick up cockroachdb/rocksdb#39 Release note: None Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com> Co-authored-by: Solon Gordon <solon@cockroachlabs.com> Co-authored-by: Andrew Kryczka <andrew.kryczka2@gmail.com>
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.
On older macOS like 10.10 we saw the following compiler error:
According to mac's
man clock_gettime: "These functions first appeared in MacOSX 10.12". So we should not try to compile it on earlier versions.
Test Plan: verified it compiles now on 10.10. Also did some investigation to
ensure it does not cause regression on macOS 10.12+, although I do not
have access to such an environment to really test.
This change is