Impala Public Jenkins has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/15596 )
Change subject: Limit short versions of KUDU_* macros to Kudu source. ...................................................................... Limit short versions of KUDU_* macros to Kudu source. So far we allowed short versions of Kudu macros in Impala by defining KUDU_HEADERS_USE_SHORT_STATUS_MACROS in all compilation units. I.e. DCHECK_OK meant KUDU_DCHECK_OK. This is a problem when we want to define our own DCHECK_OK for an Impala Status object. This commit limits KUDU_HEADERS_USE_SHORT_STATUS_MACROS to the Kudu source files. Unfortunately KUDU_HEADERS_USE_SHORT_STATUS_MACROS also controls some Kudu log macros, e.g. KUDU_LOG. With the macro KUDU_LOG is defined to LOG (glog). Without the macro KUDU_LOG is not defined, the Kudu library expects that the clients will include 'kudu/client/stubs.h' which will define KUDU_LOG to kudu::internal_logging::CerrLog. So far Impala didn't use stubs.h (we define KUDU_HEADERS_NO_STUBS), and I think we still want to use glog. So in 'common/logging.h' I defined the KUDU logging macros to glog macros (like if KUDU_HEADERS_USE_SHORT_STATUS_MACROS was still defined). Change-Id: I06a65353d2a9eecf956e4ceb8d21eda2eebc69d5 Reviewed-on: http://gerrit.cloudera.org:8080/15596 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- M be/CMakeLists.txt M be/src/common/logging.h M be/src/kudu/rpc/CMakeLists.txt M be/src/kudu/security/CMakeLists.txt M be/src/kudu/util/CMakeLists.txt M be/src/util/webserver.cc 6 files changed, 15 insertions(+), 6 deletions(-) Approvals: Impala Public Jenkins: Looks good to me, approved; Verified -- To view, visit http://gerrit.cloudera.org:8080/15596 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-Project: Impala-ASF Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I06a65353d2a9eecf956e4ceb8d21eda2eebc69d5 Gerrit-Change-Number: 15596 Gerrit-PatchSet: 3 Gerrit-Owner: Zoltan Borok-Nagy <[email protected]> Gerrit-Reviewer: Impala Public Jenkins <[email protected]> Gerrit-Reviewer: Joe McDonnell <[email protected]> Gerrit-Reviewer: Tim Armstrong <[email protected]>
