Henry Robinson has submitted this change and it was merged. Change subject: IMPALA-4758: (2/2) Impala-side changes to build with latest gutil ......................................................................
IMPALA-4758: (2/2) Impala-side changes to build with latest gutil Meant to be taken as a whole with the previous commit. This patch makes the necessary code changes to Impala and the gutil/ library to fix all compilation errors. Future upgrades to gutil/ should redo the work in this commit. * Remove kudu/ include prefix with command: git grep -l "include \"kudu/" | xargs sed -i 's/include \"kudu\//include \"/g' * Change KUDU_GUTIL_* guards to be GUTIL_* git grep -l KUDU_GUTIL | xargs sed -i 's/KUDU_GUTIL/GUTIL/g' * Replace glog/logging.h with common/logging.h git grep -l "glog/logging" | xargs sed -i 's/glog\/logging/common\/logging/g' * Provide our own implementation of since-removed MonotonicNanos() * Reinstate COMPILE_FLAGS argument to ADD_EXPORTABLE_LIBRARY, used by gutil. * Replay overwritten parts of following commits: a7c3f30 - Remove AMD Opteron Rev E workaround from atomicops 54194af - IMPALA-4631: don't use floating point operations for time unit conversions 152c586 - Improve AtomicInt abstraction and implementation * Comment out non-compiling deprecated function definitions in numbers.h * Overwrite changes from 92fafa "Use more efficient gutil implementation of Log2Ceiling" in favour of implementing them in Impala code only. * Couple of misc fixes. Change-Id: I4ac21d7d6401f21fcdfdd1132b8f322bfba4bb80 Reviewed-on: http://gerrit.cloudera.org:8080/5688 Reviewed-by: Dan Hecht <[email protected]> Tested-by: Impala Public Jenkins --- M be/src/exec/hash-table.inline.h M be/src/gutil/atomic_refcount.h M be/src/gutil/atomicops-internals-x86.cc M be/src/gutil/atomicops-internals-x86.h M be/src/gutil/atomicops.h M be/src/gutil/auxiliary/atomicops-internals-arm-generic.h M be/src/gutil/auxiliary/atomicops-internals-arm-v6plus.h M be/src/gutil/auxiliary/atomicops-internals-windows.h M be/src/gutil/basictypes.h M be/src/gutil/bind.h M be/src/gutil/bind_helpers.h M be/src/gutil/bind_internal.h M be/src/gutil/bits.cc M be/src/gutil/bits.h M be/src/gutil/callback.h M be/src/gutil/callback_forward.h M be/src/gutil/callback_internal.cc M be/src/gutil/callback_internal.h M be/src/gutil/casts.h M be/src/gutil/charmap.h M be/src/gutil/cpu.cc M be/src/gutil/cycleclock-inl.h M be/src/gutil/endian.h M be/src/gutil/fixedarray.h M be/src/gutil/gscoped_ptr.h M be/src/gutil/hash/builtin_type_hash.h M be/src/gutil/hash/city.cc M be/src/gutil/hash/city.h M be/src/gutil/hash/hash.cc M be/src/gutil/hash/hash.h M be/src/gutil/hash/hash128to64.h M be/src/gutil/hash/jenkins.cc M be/src/gutil/hash/jenkins.h M be/src/gutil/hash/jenkins_lookup2.h M be/src/gutil/hash/legacy_hash.h M be/src/gutil/hash/string_hash.h M be/src/gutil/int128.cc M be/src/gutil/int128.h M be/src/gutil/macros.h M be/src/gutil/manual_constructor.h M be/src/gutil/map-util.h M be/src/gutil/mathlimits.cc M be/src/gutil/once.cc M be/src/gutil/once.h M be/src/gutil/paranoid.h M be/src/gutil/port.h M be/src/gutil/raw_scoped_refptr_mismatch_checker.h M be/src/gutil/ref_counted.cc M be/src/gutil/ref_counted.h M be/src/gutil/ref_counted_memory.cc M be/src/gutil/ref_counted_memory.h M be/src/gutil/singleton.h M be/src/gutil/spinlock.cc M be/src/gutil/spinlock.h M be/src/gutil/spinlock_internal.cc M be/src/gutil/spinlock_internal.h M be/src/gutil/spinlock_linux-inl.h M be/src/gutil/stl_util.h M be/src/gutil/stringprintf.cc M be/src/gutil/stringprintf.h M be/src/gutil/strings/ascii_ctype.cc M be/src/gutil/strings/charset.cc M be/src/gutil/strings/charset.h M be/src/gutil/strings/escaping.cc M be/src/gutil/strings/escaping.h M be/src/gutil/strings/fastmem.h M be/src/gutil/strings/human_readable.cc M be/src/gutil/strings/human_readable.h M be/src/gutil/strings/join.cc M be/src/gutil/strings/join.h M be/src/gutil/strings/memutil.cc M be/src/gutil/strings/memutil.h M be/src/gutil/strings/numbers.cc M be/src/gutil/strings/numbers.h M be/src/gutil/strings/serialize.cc M be/src/gutil/strings/serialize.h M be/src/gutil/strings/split.cc M be/src/gutil/strings/split.h M be/src/gutil/strings/split_internal.h M be/src/gutil/strings/strcat.cc M be/src/gutil/strings/strcat.h M be/src/gutil/strings/string_util-test.cc M be/src/gutil/strings/stringpiece.cc M be/src/gutil/strings/stringpiece.h M be/src/gutil/strings/strip.cc M be/src/gutil/strings/strip.h M be/src/gutil/strings/substitute.cc M be/src/gutil/strings/substitute.h M be/src/gutil/strings/util.cc M be/src/gutil/strings/util.h M be/src/gutil/strtoint.cc M be/src/gutil/strtoint.h M be/src/gutil/synchronization_profiling.h M be/src/gutil/sysinfo.cc M be/src/gutil/threading/thread_collision_warner.cc M be/src/gutil/threading/thread_collision_warner.h M be/src/gutil/type_traits.h M be/src/gutil/walltime.cc M be/src/gutil/walltime.h M be/src/runtime/buffered-tuple-stream-test.cc M be/src/runtime/buffered-tuple-stream-v2-test.cc M be/src/runtime/bufferpool/suballocator.cc M be/src/runtime/collection-value-builder.h M be/src/util/bit-util-test.cc M be/src/util/bit-util.h M be/src/util/error-util.h M be/src/util/time.h M cmake_modules/kudu_cmake_fns.txt 108 files changed, 492 insertions(+), 472 deletions(-) Approvals: Impala Public Jenkins: Verified Dan Hecht: Looks good to me, approved -- To view, visit http://gerrit.cloudera.org:8080/5688 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ac21d7d6401f21fcdfdd1132b8f322bfba4bb80 Gerrit-PatchSet: 10 Gerrit-Project: Impala-ASF Gerrit-Branch: master Gerrit-Owner: Henry Robinson <[email protected]> Gerrit-Reviewer: Dan Hecht <[email protected]> Gerrit-Reviewer: Henry Robinson <[email protected]> Gerrit-Reviewer: Impala Public Jenkins Gerrit-Reviewer: Jim Apple <[email protected]> Gerrit-Reviewer: Tim Armstrong <[email protected]> Gerrit-Reviewer: Todd Lipcon <[email protected]>
