Repository: kudu Updated Branches: refs/heads/master debcb8ea2 -> b525378c5
Remove namespace hack in hms_client.h To avoid having to use the very long Apache.Hadoop.Hive namespace for all of the Thrift-generated HMS types, we aliased the namespace in hms_client.h to 'hive'. This doesn't really work well, I've seen issues in tests where for unknown reasons the hive namespace doesn't work. A better fix is to just edit hive_metastore.thrift to change the generated namespace, since it's vendored anyway. This exposed that our CMake thrift generator doesn't properly consider the input .thrift files to be a dependency of the code generation step, so I had to fix that as well to get this to compile without blowing away the build dir. Change-Id: I1b4d823a0329c63c9ce830f855c3d1021fbc08cf Reviewed-on: http://gerrit.cloudera.org:8080/9553 Reviewed-by: Adar Dembo <a...@cloudera.com> 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/b525378c Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/b525378c Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/b525378c Branch: refs/heads/master Commit: b525378c550a8227257ffac2a8d45a6d519f33f7 Parents: debcb8e Author: Dan Burkert <danburk...@apache.org> Authored: Wed Mar 7 19:03:21 2018 -0800 Committer: Dan Burkert <danburk...@apache.org> Committed: Thu Mar 8 04:29:21 2018 +0000 ---------------------------------------------------------------------- cmake_modules/FindThrift.cmake | 1 + src/kudu/hms/hive_metastore.thrift | 5 ++++- src/kudu/hms/hms_client.h | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/b525378c/cmake_modules/FindThrift.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake index 4016c20..834bbfd 100644 --- a/cmake_modules/FindThrift.cmake +++ b/cmake_modules/FindThrift.cmake @@ -108,6 +108,7 @@ function(THRIFT_GENERATE_CPP SRCS HDRS TGTS) add_custom_command( OUTPUT ${THRIFT_CC_OUT} ${THRIFT_H_OUT} + DEPENDS ${ABS_FIL} COMMAND ${THRIFT_EXECUTABLE} ARGS --gen cpp:moveable_types http://git-wip-us.apache.org/repos/asf/kudu/blob/b525378c/src/kudu/hms/hive_metastore.thrift ---------------------------------------------------------------------- diff --git a/src/kudu/hms/hive_metastore.thrift b/src/kudu/hms/hive_metastore.thrift index 448ce6c..969f4f8 100644 --- a/src/kudu/hms/hive_metastore.thrift +++ b/src/kudu/hms/hive_metastore.thrift @@ -23,6 +23,9 @@ # With backports: # - HIVE-16993 # +# With edits: +# - Change cpp namespace to 'hive' to match the Kudu codebase style. +# # Before updating to a new version, consider that Kudu must remain compatible # with a range of Hive Metastore versions. @@ -34,7 +37,7 @@ include "share/fb303/if/fb303.thrift" namespace java org.apache.hadoop.hive.metastore.api namespace php metastore -namespace cpp Apache.Hadoop.Hive +namespace cpp hive const string DDL_TIME = "transient_lastDdlTime" http://git-wip-us.apache.org/repos/asf/kudu/blob/b525378c/src/kudu/hms/hms_client.h ---------------------------------------------------------------------- diff --git a/src/kudu/hms/hms_client.h b/src/kudu/hms/hms_client.h index a71fcf6..21f18f9 100644 --- a/src/kudu/hms/hms_client.h +++ b/src/kudu/hms/hms_client.h @@ -28,8 +28,6 @@ #include "kudu/util/slice.h" #include "kudu/util/status.h" -namespace hive = Apache::Hadoop::Hive; - namespace kudu { class HostPort;
