Repository: kudu Updated Branches: refs/heads/master 87c1a5f50 -> 279b72916
macOS: fix compile error introduced by 141de3377e6bdd Change-Id: Id2a9556810feeb3128b97d60afb18a2547e0af5c Reviewed-on: http://gerrit.cloudera.org:8080/5009 Reviewed-by: Todd Lipcon <[email protected]> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/2fc0e2e1 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/2fc0e2e1 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/2fc0e2e1 Branch: refs/heads/master Commit: 2fc0e2e132a66e9bad93c9fcfea9e0c47261202a Parents: 87c1a5f Author: Dan Burkert <[email protected]> Authored: Tue Nov 8 13:05:14 2016 -0800 Committer: Todd Lipcon <[email protected]> Committed: Tue Nov 8 23:12:56 2016 +0000 ---------------------------------------------------------------------- .../integration-tests/external_mini_cluster_fs_inspector.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/2fc0e2e1/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc ---------------------------------------------------------------------- diff --git a/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc b/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc index 4ddbdbf..2fa40b3 100644 --- a/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc +++ b/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc @@ -184,12 +184,16 @@ Status ExternalMiniClusterFsInspector::ReadTabletSuperBlockOnTS(int index, return pb_util::ReadPBContainerFromPath(env_, sb_path, sb); } -int64_t ExternalMiniClusterFsInspector::GetTabletSuperBlockMTimeOrDie( - int ts_index, const std::string& tablet_id) { +int64_t ExternalMiniClusterFsInspector::GetTabletSuperBlockMTimeOrDie(int ts_index, + const string& tablet_id) { const auto& sb_path = GetTabletSuperBlockPathOnTS(ts_index, tablet_id); struct stat s; CHECK_ERR(stat(sb_path.c_str(), &s)) << "failed to stat: " << sb_path; +#ifdef __APPLE__ + return s.st_mtimespec.tv_sec * 1e6 + s.st_mtimespec.tv_nsec / 1000; +#else return s.st_mtim.tv_sec * 1e6 + s.st_mtim.tv_nsec / 1000; +#endif } string ExternalMiniClusterFsInspector::GetConsensusMetadataPathOnTS(int index,
