You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by al...@apache.org on 2019/10/21 02:28:54 UTC

[kudu] branch master updated: util: fix macOS build of thread.cc

This is an automated email from the ASF dual-hosted git repository.

alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new d4c14f6  util: fix macOS build of thread.cc
d4c14f6 is described below

commit d4c14f6c1f6aae526390e868ecc3d5f8c5d2d47d
Author: Andrew Wong <aw...@apache.org>
AuthorDate: Sat Oct 19 23:58:28 2019 -0700

    util: fix macOS build of thread.cc
    
    On macOS builds would fail with:
    
    Undefined symbols for architecture x86_64:
      "kudu::EasyJson& kudu::EasyJson::operator=<unsigned long>(unsigned long)", referenced from:
         kudu::ThreadMgr::ThreadPathHandler(kudu::WebCallbackRegistry::WebRequest const&, kudu::WebCallbackRegistry::WebResponse*) const in thread.cc.o
    ld: symbol(s) not found for architecture x86_64
    clang: error: linker command failed with exit code 1 (use -v to see invocation)
    
    Rather than instantiating an EasyJson template for unsigned long, which
    would be ambiguous, this replaces the usage of size_t with uint64_t.
    
    Change-Id: Iddb61d9a933a9b76ec73fbfd0a4ef555bc27786d
    Reviewed-on: http://gerrit.cloudera.org:8080/14516
    Tested-by: Kudu Jenkins
    Reviewed-by: Hannah Nguyen <ha...@cloudera.com>
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
---
 src/kudu/util/thread.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kudu/util/thread.cc b/src/kudu/util/thread.cc
index 9f5eb01..fb68977 100644
--- a/src/kudu/util/thread.cc
+++ b/src/kudu/util/thread.cc
@@ -427,7 +427,7 @@ void ThreadMgr::ThreadPathHandler(const WebCallbackRegistry::WebRequest& req,
     }
   } else {
     // List all thread groups and the number of threads running in each.
-    vector<pair<string, size_t>> thread_categories_info;
+    vector<pair<string, uint64_t>> thread_categories_info;
     uint64_t running;
     {
       // See comment above regarding short critical sections.