You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by he...@apache.org on 2017/03/29 02:53:55 UTC
[14/14] incubator-impala git commit: 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 <dh...@cloudera.com>
Tested-by: Impala Public Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/23100102
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/23100102
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/23100102
Branch: refs/heads/master
Commit: 23100102c0a9a8f3a8a7ff069cbfaa7a56628238
Parents: 02f3e3f
Author: Henry Robinson <he...@cloudera.com>
Authored: Fri Mar 24 15:44:35 2017 -0700
Committer: Henry Robinson <he...@cloudera.com>
Committed: Wed Mar 29 02:52:34 2017 +0000
----------------------------------------------------------------------
be/src/exec/hash-table.inline.h | 4 +-
be/src/gutil/atomic_refcount.h | 10 ++--
be/src/gutil/atomicops-internals-x86.cc | 26 ++-------
be/src/gutil/atomicops-internals-x86.h | 48 ++++++----------
be/src/gutil/atomicops.h | 16 +++---
.../auxiliary/atomicops-internals-arm-generic.h | 4 +-
.../auxiliary/atomicops-internals-arm-v6plus.h | 2 +-
.../auxiliary/atomicops-internals-windows.h | 2 +-
be/src/gutil/basictypes.h | 4 +-
be/src/gutil/bind.h | 10 ++--
be/src/gutil/bind_helpers.h | 10 ++--
be/src/gutil/bind_internal.h | 16 +++---
be/src/gutil/bits.cc | 2 +-
be/src/gutil/bits.h | 14 ++---
be/src/gutil/callback.h | 14 ++---
be/src/gutil/callback_forward.h | 6 +-
be/src/gutil/callback_internal.cc | 2 +-
be/src/gutil/callback_internal.h | 10 ++--
be/src/gutil/casts.h | 8 +--
be/src/gutil/charmap.h | 6 +-
be/src/gutil/cpu.cc | 6 +-
be/src/gutil/cycleclock-inl.h | 10 ++--
be/src/gutil/endian.h | 6 +-
be/src/gutil/fixedarray.h | 8 +--
be/src/gutil/gscoped_ptr.h | 14 ++---
be/src/gutil/hash/builtin_type_hash.h | 8 +--
be/src/gutil/hash/city.cc | 14 ++---
be/src/gutil/hash/city.h | 4 +-
be/src/gutil/hash/hash.cc | 12 ++--
be/src/gutil/hash/hash.h | 22 ++++----
be/src/gutil/hash/hash128to64.h | 4 +-
be/src/gutil/hash/jenkins.cc | 10 ++--
be/src/gutil/hash/jenkins.h | 2 +-
be/src/gutil/hash/jenkins_lookup2.h | 4 +-
be/src/gutil/hash/legacy_hash.h | 6 +-
be/src/gutil/hash/string_hash.h | 10 ++--
be/src/gutil/int128.cc | 4 +-
be/src/gutil/int128.h | 2 +-
be/src/gutil/macros.h | 5 +-
be/src/gutil/manual_constructor.h | 2 +-
be/src/gutil/map-util.h | 4 +-
be/src/gutil/mathlimits.cc | 4 +-
be/src/gutil/once.cc | 10 ++--
be/src/gutil/once.h | 12 ++--
be/src/gutil/paranoid.h | 4 +-
be/src/gutil/port.h | 6 +-
.../gutil/raw_scoped_refptr_mismatch_checker.h | 8 +--
be/src/gutil/ref_counted.cc | 6 +-
be/src/gutil/ref_counted.h | 6 +-
be/src/gutil/ref_counted_memory.cc | 4 +-
be/src/gutil/ref_counted_memory.h | 12 ++--
be/src/gutil/singleton.h | 6 +-
be/src/gutil/spinlock.cc | 10 ++--
be/src/gutil/spinlock.h | 8 +--
be/src/gutil/spinlock_internal.cc | 8 +--
be/src/gutil/spinlock_internal.h | 4 +-
be/src/gutil/spinlock_linux-inl.h | 2 +-
be/src/gutil/stl_util.h | 6 +-
be/src/gutil/stringprintf.cc | 8 +--
be/src/gutil/stringprintf.h | 2 +-
be/src/gutil/strings/ascii_ctype.cc | 2 +-
be/src/gutil/strings/charset.cc | 2 +-
be/src/gutil/strings/charset.h | 2 +-
be/src/gutil/strings/escaping.cc | 16 +++---
be/src/gutil/strings/escaping.h | 10 ++--
be/src/gutil/strings/fastmem.h | 4 +-
be/src/gutil/strings/human_readable.cc | 10 ++--
be/src/gutil/strings/human_readable.h | 6 +-
be/src/gutil/strings/join.cc | 12 ++--
be/src/gutil/strings/join.h | 14 ++---
be/src/gutil/strings/memutil.cc | 4 +-
be/src/gutil/strings/memutil.h | 2 +-
be/src/gutil/strings/numbers.cc | 18 +++---
be/src/gutil/strings/numbers.h | 58 ++++++++++----------
be/src/gutil/strings/serialize.cc | 16 +++---
be/src/gutil/strings/serialize.h | 18 +++---
be/src/gutil/strings/split.cc | 18 +++---
be/src/gutil/strings/split.h | 18 +++---
be/src/gutil/strings/split_internal.h | 4 +-
be/src/gutil/strings/strcat.cc | 14 ++---
be/src/gutil/strings/strcat.h | 6 +-
be/src/gutil/strings/string_util-test.cc | 2 +-
be/src/gutil/strings/stringpiece.cc | 12 ++--
be/src/gutil/strings/stringpiece.h | 10 ++--
be/src/gutil/strings/strip.cc | 6 +-
be/src/gutil/strings/strip.h | 4 +-
be/src/gutil/strings/substitute.cc | 14 ++---
be/src/gutil/strings/substitute.h | 6 +-
be/src/gutil/strings/util.cc | 16 +++---
be/src/gutil/strings/util.h | 6 +-
be/src/gutil/strtoint.cc | 4 +-
be/src/gutil/strtoint.h | 6 +-
be/src/gutil/synchronization_profiling.h | 2 +-
be/src/gutil/sysinfo.cc | 10 ++--
.../gutil/threading/thread_collision_warner.cc | 6 +-
.../gutil/threading/thread_collision_warner.h | 6 +-
be/src/gutil/type_traits.h | 2 +-
be/src/gutil/walltime.cc | 3 +-
be/src/gutil/walltime.h | 23 +++++---
be/src/runtime/buffered-tuple-stream-test.cc | 2 +-
be/src/runtime/buffered-tuple-stream-v2-test.cc | 2 +-
be/src/runtime/bufferpool/suballocator.cc | 3 +-
be/src/runtime/collection-value-builder.h | 4 +-
be/src/util/bit-util-test.cc | 18 +++---
be/src/util/bit-util.h | 35 ++++++++++++
be/src/util/error-util.h | 3 +-
be/src/util/time.h | 4 +-
cmake_modules/kudu_cmake_fns.txt | 6 +-
108 files changed, 493 insertions(+), 473 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/exec/hash-table.inline.h
----------------------------------------------------------------------
diff --git a/be/src/exec/hash-table.inline.h b/be/src/exec/hash-table.inline.h
index c266704..f055649 100644
--- a/be/src/exec/hash-table.inline.h
+++ b/be/src/exec/hash-table.inline.h
@@ -394,8 +394,8 @@ inline int64_t HashTable::CurrentMemSize() const {
}
inline int64_t HashTable::NumInsertsBeforeResize() const {
- return max<int64_t>(0,
- static_cast<int64_t>(num_buckets_ * MAX_FILL_FACTOR) - num_filled_buckets_);
+ return std::max<int64_t>(
+ 0, static_cast<int64_t>(num_buckets_ * MAX_FILL_FACTOR) - num_filled_buckets_);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/atomic_refcount.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/atomic_refcount.h b/be/src/gutil/atomic_refcount.h
index 9c80921..12bbdda 100644
--- a/be/src/gutil/atomic_refcount.h
+++ b/be/src/gutil/atomic_refcount.h
@@ -37,12 +37,12 @@
//
// If you need to do something very different from this, use a Mutex.
-#include <glog/logging.h>
+#include <common/logging.h>
-#include "kudu/gutil/atomicops.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/dynamic_annotations.h"
+#include "gutil/atomicops.h"
+#include "gutil/integral_types.h"
+#include "gutil/logging-inl.h"
+#include "gutil/dynamic_annotations.h"
namespace base {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/atomicops-internals-x86.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/atomicops-internals-x86.cc b/be/src/gutil/atomicops-internals-x86.cc
index 5d4529e..f02edc6 100644
--- a/be/src/gutil/atomicops-internals-x86.cc
+++ b/be/src/gutil/atomicops-internals-x86.cc
@@ -23,13 +23,13 @@
// This module gets enough CPU information to optimize the
// atomicops module on x86.
-#include "kudu/gutil/atomicops-internals-x86.h"
+#include "gutil/atomicops-internals-x86.h"
#include <string.h>
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/integral_types.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/integral_types.h"
// This file only makes sense with atomicops-internals-x86.h -- it
// depends on structs that are defined in that file. If atomicops.h
@@ -60,9 +60,8 @@
// Set the flags so that code will run correctly and conservatively
// until InitGoogle() is called.
struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures = {
- false, // bug can't exist before process spawns multiple threads
false, // no SSE2
- false, // no cmpxchg16b
+ false // no cmpxchg16b
};
// Initialize the AtomicOps_Internalx86CPUFeatures struct.
@@ -90,19 +89,6 @@ static void AtomicOps_Internalx86CPUFeaturesInit() {
model += ((eax >> 16) & 0xf) << 4;
}
- // Opteron Rev E has a bug in which on very rare occasions a locked
- // instruction doesn't act as a read-acquire barrier if followed by a
- // non-locked read-modify-write instruction. Rev F has this bug in
- // pre-release versions, but not in versions released to customers,
- // so we test only for Rev E, which is family 15, model 32..63 inclusive.
- if (strcmp(vendor, "AuthenticAMD") == 0 && // AMD
- family == 15 &&
- 32 <= model && model <= 63) {
- AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug = true;
- } else {
- AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug = false;
- }
-
// edx bit 26 is SSE2 which we use to tell use whether we can use mfence
AtomicOps_Internalx86CPUFeatures.has_sse2 = ((edx >> 26) & 1);
@@ -112,8 +98,6 @@ static void AtomicOps_Internalx86CPUFeaturesInit() {
VLOG(1) << "vendor " << vendor <<
" family " << family <<
" model " << model <<
- " amd_lock_mb_bug " <<
- AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug <<
" sse2 " << AtomicOps_Internalx86CPUFeatures.has_sse2 <<
" cmpxchg16b " << AtomicOps_Internalx86CPUFeatures.has_cmpxchg16b;
}
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/atomicops-internals-x86.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/atomicops-internals-x86.h b/be/src/gutil/atomicops-internals-x86.h
index acbd2e3..90ae25a 100644
--- a/be/src/gutil/atomicops-internals-x86.h
+++ b/be/src/gutil/atomicops-internals-x86.h
@@ -29,7 +29,7 @@
#include <stdint.h>
-#include <glog/logging.h>
+#include <common/logging.h>
#define BASE_HAS_ATOMIC64 1 // Use only in tests and base/atomic*
@@ -43,8 +43,6 @@
// Features of this x86. Values may not be correct before InitGoogle() is run,
// but are set conservatively.
struct AtomicOps_x86CPUFeatureStruct {
- bool has_amd_lock_mb_bug; // Processor has AMD memory-barrier bug; do lfence
- // after acquire compare-and-swap.
bool has_sse2; // Processor has SSE2.
bool has_cmpxchg16b; // Processor supports cmpxchg16b instruction.
};
@@ -102,9 +100,6 @@ inline Atomic32 Acquire_AtomicExchange(volatile Atomic32* ptr,
Atomic32 new_value) {
CheckNaturalAlignment(ptr);
Atomic32 old_val = NoBarrier_AtomicExchange(ptr, new_value);
- if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
- __asm__ __volatile__("lfence" : : : "memory");
- }
return old_val;
}
@@ -132,20 +127,15 @@ inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
: "+r" (temp), "+m" (*ptr)
: : "memory");
// temp now holds the old value of *ptr
- if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
- __asm__ __volatile__("lfence" : : : "memory");
- }
return temp + increment;
}
+// On x86, the NoBarrier_CompareAndSwap() uses a locked instruction and so also
+// provides both acquire and release barriers.
inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
Atomic32 old_value,
Atomic32 new_value) {
- Atomic32 x = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
- if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
- __asm__ __volatile__("lfence" : : : "memory");
- }
- return x;
+ return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
}
inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
@@ -154,6 +144,12 @@ inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
}
+inline Atomic32 Barrier_CompareAndSwap(volatile Atomic32* ptr,
+ Atomic32 old_value,
+ Atomic32 new_value) {
+ return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
CheckNaturalAlignment(ptr);
*ptr = value;
@@ -257,9 +253,6 @@ inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
inline Atomic64 Acquire_AtomicExchange(volatile Atomic64* ptr,
Atomic64 new_value) {
Atomic64 old_val = NoBarrier_AtomicExchange(ptr, new_value);
- if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
- __asm__ __volatile__("lfence" : : : "memory");
- }
return old_val;
}
@@ -287,9 +280,6 @@ inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
: "+r" (temp), "+m" (*ptr)
: : "memory");
// temp now contains the previous value of *ptr
- if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
- __asm__ __volatile__("lfence" : : : "memory");
- }
return temp + increment;
}
@@ -403,9 +393,6 @@ inline Atomic64 Acquire_AtomicExchange(volatile Atomic64* ptr,
Atomic64 new_val) {
CheckNaturalAlignment(ptr);
Atomic64 old_val = NoBarrier_AtomicExchange(ptr, new_val);
- if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
- __asm__ __volatile__("lfence" : : : "memory");
- }
return old_val;
}
@@ -431,9 +418,6 @@ inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
Atomic64 increment) {
CheckNaturalAlignment(ptr);
Atomic64 new_val = NoBarrier_AtomicIncrement(ptr, increment);
- if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
- __asm__ __volatile__("lfence" : : : "memory");
- }
return new_val;
}
@@ -492,11 +476,7 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
Atomic64 old_value,
Atomic64 new_value) {
- Atomic64 x = NoBarrier_CompareAndSwap(ptr, old_value, new_value);
- if (AtomicOps_Internalx86CPUFeatures.has_amd_lock_mb_bug) {
- __asm__ __volatile__("lfence" : : : "memory");
- }
- return x;
+ return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
}
inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
@@ -505,6 +485,12 @@ inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
}
+inline Atomic64 Barrier_CompareAndSwap(volatile Atomic64* ptr,
+ Atomic64 old_value,
+ Atomic64 new_value) {
+ return NoBarrier_CompareAndSwap(ptr, old_value, new_value);
+}
+
} // namespace subtle
} // namespace base
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/atomicops.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/atomicops.h b/be/src/gutil/atomicops.h
index fa4c44c..ad8d773 100644
--- a/be/src/gutil/atomicops.h
+++ b/be/src/gutil/atomicops.h
@@ -67,23 +67,23 @@
// #endif
// ------------------------------------------------------------------------
-#include "kudu/gutil/arm_instruction_set_select.h"
+#include "gutil/arm_instruction_set_select.h"
// ThreadSanitizer provides own implementation of atomicops.
#if defined(THREAD_SANITIZER)
-#include "kudu/gutil/atomicops-internals-tsan.h"
+#include "gutil/atomicops-internals-tsan.h"
#elif defined(__APPLE__)
-#include "kudu/gutil/atomicops-internals-macosx.h"
+#include "gutil/atomicops-internals-macosx.h"
#elif defined(__GNUC__) && defined(ARMV6)
-#include "kudu/gutil/atomicops-internals-arm-v6plus.h"
+#include "gutil/atomicops-internals-arm-v6plus.h"
#elif defined(ARMV3)
-#include "kudu/gutil/atomicops-internals-arm-generic.h"
+#include "gutil/atomicops-internals-arm-generic.h"
#elif defined(__GNUC__) && (defined(__i386) || defined(__x86_64__))
-#include "kudu/gutil/atomicops-internals-x86.h"
+#include "gutil/atomicops-internals-x86.h"
#elif defined(__GNUC__) && defined(ARCH_POWERPC64)
-#include "kudu/gutil/atomicops-internals-powerpc.h"
+#include "gutil/atomicops-internals-powerpc.h"
#elif defined(OS_WINDOWS)
-#include "kudu/gutil/atomicops-internals-windows.h"
+#include "gutil/atomicops-internals-windows.h"
#else
#error You need to implement atomic operations for this architecture
#endif
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/auxiliary/atomicops-internals-arm-generic.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/auxiliary/atomicops-internals-arm-generic.h b/be/src/gutil/auxiliary/atomicops-internals-arm-generic.h
index 417c6a0..0a73b85 100644
--- a/be/src/gutil/auxiliary/atomicops-internals-arm-generic.h
+++ b/be/src/gutil/auxiliary/atomicops-internals-arm-generic.h
@@ -11,8 +11,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include "kudu/gutil/macros.h" // For COMPILE_ASSERT
-#include "kudu/gutil/port.h" // ATTRIBUTE_WEAK
+#include "gutil/macros.h" // For COMPILE_ASSERT
+#include "gutil/port.h" // ATTRIBUTE_WEAK
typedef int32_t Atomic32;
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/auxiliary/atomicops-internals-arm-v6plus.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/auxiliary/atomicops-internals-arm-v6plus.h b/be/src/gutil/auxiliary/atomicops-internals-arm-v6plus.h
index edafc4e..631f0f0 100644
--- a/be/src/gutil/auxiliary/atomicops-internals-arm-v6plus.h
+++ b/be/src/gutil/auxiliary/atomicops-internals-arm-v6plus.h
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "kudu/gutil/basictypes.h" // For COMPILE_ASSERT
+#include "gutil/basictypes.h" // For COMPILE_ASSERT
// The LDREXD and STREXD instructions in ARM all v7 variants or above. In v6,
// only some variants support it. For simplicity, we only use exclusive
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/auxiliary/atomicops-internals-windows.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/auxiliary/atomicops-internals-windows.h b/be/src/gutil/auxiliary/atomicops-internals-windows.h
index 96674dc..11d7d9d 100644
--- a/be/src/gutil/auxiliary/atomicops-internals-windows.h
+++ b/be/src/gutil/auxiliary/atomicops-internals-windows.h
@@ -11,7 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "kudu/gutil/basictypes.h" // For COMPILE_ASSERT
+#include "gutil/basictypes.h" // For COMPILE_ASSERT
typedef int32 Atomic32;
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/basictypes.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/basictypes.h b/be/src/gutil/basictypes.h
index 1c095ca..2f21d03 100644
--- a/be/src/gutil/basictypes.h
+++ b/be/src/gutil/basictypes.h
@@ -5,8 +5,8 @@
#ifndef BASE_BASICTYPES_H_
#define BASE_BASICTYPES_H_
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/macros.h"
+#include "gutil/integral_types.h"
+#include "gutil/macros.h"
// Argument type used in interfaces that can optionally take ownership
// of a passed in argument. If TAKE_OWNERSHIP is passed, the called
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/bind.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/bind.h b/be/src/gutil/bind.h
index 8875f70..534f208 100644
--- a/be/src/gutil/bind.h
+++ b/be/src/gutil/bind.h
@@ -7,11 +7,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef KUDU_GUTIL_BIND_H_
-#define KUDU_GUTIL_BIND_H_
+#ifndef GUTIL_BIND_H_
+#define GUTIL_BIND_H_
-#include "kudu/gutil/bind_internal.h"
-#include "kudu/gutil/callback_internal.h"
+#include "gutil/bind_internal.h"
+#include "gutil/callback_internal.h"
// -----------------------------------------------------------------------------
// Usage documentation
@@ -536,4 +536,4 @@ Bind(Functor functor, const P1& p1, const P2& p2, const P3& p3, const P4& p4,
} // namespace kudu
-#endif // KUDU_GUTIL_BIND_H_
+#endif // GUTIL_BIND_H_
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/bind_helpers.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/bind_helpers.h b/be/src/gutil/bind_helpers.h
index 8a106a6..a60b518 100644
--- a/be/src/gutil/bind_helpers.h
+++ b/be/src/gutil/bind_helpers.h
@@ -140,14 +140,14 @@
// In most cases MessageLoop::DeleteSoon() is a better
// fit.
-#ifndef KUDU_GUTIL_BIND_HELPERS_H_
-#define KUDU_GUTIL_BIND_HELPERS_H_
+#ifndef GUTIL_BIND_HELPERS_H_
+#define GUTIL_BIND_HELPERS_H_
#include <assert.h>
-#include "kudu/gutil/basictypes.h"
-#include "kudu/gutil/callback.h"
-#include "kudu/gutil/template_util.h"
+#include "gutil/basictypes.h"
+#include "gutil/callback.h"
+#include "gutil/template_util.h"
// Unneeded define from Chromium
#define BASE_EXPORT
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/bind_internal.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/bind_internal.h b/be/src/gutil/bind_internal.h
index 6764d7e..639e077 100644
--- a/be/src/gutil/bind_internal.h
+++ b/be/src/gutil/bind_internal.h
@@ -7,16 +7,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef KUDU_GUTIL_BIND_INTERNAL_H_
-#define KUDU_GUTIL_BIND_INTERNAL_H_
+#ifndef GUTIL_BIND_INTERNAL_H_
+#define GUTIL_BIND_INTERNAL_H_
-#include "kudu/gutil/bind_helpers.h"
-#include "kudu/gutil/callback_internal.h"
-#include "kudu/gutil/raw_scoped_refptr_mismatch_checker.h"
-#include "kudu/gutil/template_util.h"
+#include "gutil/bind_helpers.h"
+#include "gutil/callback_internal.h"
+#include "gutil/raw_scoped_refptr_mismatch_checker.h"
+#include "gutil/template_util.h"
#if defined(OS_WIN)
-#include "kudu/gutil/bind_internal_win.h"
+#include "gutil/bind_internal_win.h"
#endif
// During Chromium import, WeakPtr-related code was removed.
@@ -2692,4 +2692,4 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6,
} // namespace internal
} // namespace kudu
-#endif // KUDU_GUTIL_BIND_INTERNAL_H_
+#endif // GUTIL_BIND_INTERNAL_H_
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/bits.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/bits.cc b/be/src/gutil/bits.cc
index 333e464..bc4e451 100644
--- a/be/src/gutil/bits.cc
+++ b/be/src/gutil/bits.cc
@@ -2,7 +2,7 @@
//
// Derived from code by Moses Charikar
-#include "kudu/gutil/bits.h"
+#include "gutil/bits.h"
#include <assert.h>
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/bits.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/bits.h b/be/src/gutil/bits.h
index 639186e..d2489be 100644
--- a/be/src/gutil/bits.h
+++ b/be/src/gutil/bits.h
@@ -2,12 +2,12 @@
//
// A collection of useful (static) bit-twiddling functions.
-#include <glog/logging.h>
+#include <common/logging.h>
-#include "kudu/gutil/basictypes.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/macros.h"
+#include "gutil/basictypes.h"
+#include "gutil/integral_types.h"
+#include "gutil/logging-inl.h"
+#include "gutil/macros.h"
#ifndef _BITS_H_
#define _BITS_H_
@@ -156,9 +156,9 @@ inline int Bits::FindLSBSetNonZero64(uint64 n) {
return __builtin_ctzll(n);
}
#elif defined(_MSC_VER)
-#include "kudu/gutil/bits-internal-windows.h"
+#include "gutil/bits-internal-windows.h"
#else
-#include "kudu/gutil/bits-internal-unknown.h"
+#include "gutil/bits-internal-unknown.h"
#endif
inline int Bits::CountOnesInByte(unsigned char n) {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/callback.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/callback.h b/be/src/gutil/callback.h
index 1a41622..b0b29b2 100644
--- a/be/src/gutil/callback.h
+++ b/be/src/gutil/callback.h
@@ -7,15 +7,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef KUDU_GUTIL_CALLBACK_H_
-#define KUDU_GUTIL_CALLBACK_H_
+#ifndef GUTIL_CALLBACK_H_
+#define GUTIL_CALLBACK_H_
-#include "kudu/gutil/callback_forward.h"
-#include "kudu/gutil/callback_internal.h"
-#include "kudu/gutil/template_util.h"
+#include "gutil/callback_forward.h"
+#include "gutil/callback_internal.h"
+#include "gutil/template_util.h"
// NOTE: Header files that do not require the full definition of Callback or
-// Closure should #include "kudu/gutil/callback_forward.h" instead of this file.
+// Closure should #include "gutil/callback_forward.h" instead of this file.
// -----------------------------------------------------------------------------
// Introduction
@@ -762,4 +762,4 @@ typedef Callback<void(void)> Closure;
} // namespace kudu
-#endif // KUDU_GUTIL_CALLBACK_H
+#endif // GUTIL_CALLBACK_H
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/callback_forward.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/callback_forward.h b/be/src/gutil/callback_forward.h
index 956ff73..1f4958d 100644
--- a/be/src/gutil/callback_forward.h
+++ b/be/src/gutil/callback_forward.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef KUDU_GUTIL_CALLBACK_FORWARD_H_
-#define KUDU_GUTIL_CALLBACK_FORWARD_H_
+#ifndef GUTIL_CALLBACK_FORWARD_H_
+#define GUTIL_CALLBACK_FORWARD_H_
namespace kudu {
@@ -14,4 +14,4 @@ typedef Callback<void(void)> Closure;
} // namespace kudu
-#endif // KUDU_GUTIL_CALLBACK_FORWARD_H
+#endif // GUTIL_CALLBACK_FORWARD_H
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/callback_internal.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/callback_internal.cc b/be/src/gutil/callback_internal.cc
index 05b9e8f..5a24836 100644
--- a/be/src/gutil/callback_internal.cc
+++ b/be/src/gutil/callback_internal.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "kudu/gutil/callback_internal.h"
+#include "gutil/callback_internal.h"
namespace kudu {
namespace internal {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/callback_internal.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/callback_internal.h b/be/src/gutil/callback_internal.h
index 47b5655..ed91f45 100644
--- a/be/src/gutil/callback_internal.h
+++ b/be/src/gutil/callback_internal.h
@@ -5,13 +5,13 @@
// This file contains utility functions and classes that help the
// implementation, and management of the Callback objects.
-#ifndef KUDU_GUTIL_CALLBACK_INTERNAL_H_
-#define KUDU_GUTIL_CALLBACK_INTERNAL_H_
+#ifndef GUTIL_CALLBACK_INTERNAL_H_
+#define GUTIL_CALLBACK_INTERNAL_H_
#include <stddef.h>
-#include "kudu/gutil/gscoped_ptr.h"
-#include "kudu/gutil/ref_counted.h"
+#include "gutil/gscoped_ptr.h"
+#include "gutil/ref_counted.h"
template <typename T>
class ScopedVector;
@@ -174,4 +174,4 @@ typename base::enable_if<IsMoveOnlyType<T>::value, T>::type CallbackForward(T& t
} // namespace internal
} // namespace kudu
-#endif // KUDU_GUTIL_CALLBACK_INTERNAL_H_
+#endif // GUTIL_CALLBACK_INTERNAL_H_
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/casts.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/casts.h b/be/src/gutil/casts.h
index 474e083..8f5966a 100644
--- a/be/src/gutil/casts.h
+++ b/be/src/gutil/casts.h
@@ -14,11 +14,11 @@
#include <string.h> // for memcpy
#include <limits.h> // for enumeration casts and tests
-#include <glog/logging.h>
+#include <common/logging.h>
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/template_util.h"
-#include "kudu/gutil/type_traits.h"
+#include "gutil/macros.h"
+#include "gutil/template_util.h"
+#include "gutil/type_traits.h"
// Use implicit_cast as a safe version of static_cast or const_cast
// for implicit conversions. For example:
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/charmap.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/charmap.h b/be/src/gutil/charmap.h
index 2698bbe..1b8d3aa 100644
--- a/be/src/gutil/charmap.h
+++ b/be/src/gutil/charmap.h
@@ -18,9 +18,9 @@
#include <string.h>
-#include "kudu/gutil/basictypes.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/type_traits.h"
+#include "gutil/basictypes.h"
+#include "gutil/integral_types.h"
+#include "gutil/type_traits.h"
class Charmap {
public:
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/cpu.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/cpu.cc b/be/src/gutil/cpu.cc
index f4c3885..3ebfa4a 100644
--- a/be/src/gutil/cpu.cc
+++ b/be/src/gutil/cpu.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "kudu/gutil/cpu.h"
+#include "gutil/cpu.h"
#include <stdlib.h>
#include <string.h>
#include <algorithm>
-#include "kudu/gutil/basictypes.h"
-#include "kudu/gutil/strings/stringpiece.h"
+#include "gutil/basictypes.h"
+#include "gutil/strings/stringpiece.h"
#if defined(__x86_64__)
#if defined(_MSC_VER)
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/cycleclock-inl.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/cycleclock-inl.h b/be/src/gutil/cycleclock-inl.h
index 7738592..7e83491 100644
--- a/be/src/gutil/cycleclock-inl.h
+++ b/be/src/gutil/cycleclock-inl.h
@@ -36,8 +36,8 @@
#include <sys/time.h>
-#include "kudu/gutil/port.h"
-#include "kudu/gutil/arm_instruction_set_select.h"
+#include "gutil/port.h"
+#include "gutil/arm_instruction_set_select.h"
// Please do not nest #if directives. Keep one section, and one #if per
// platform.
@@ -148,7 +148,7 @@ inline int64 CycleClock::Now() {
// ----------------------------------------------------------------
#elif defined(ARMV6) // V6 is the earliest arm that has a standard cyclecount
-#include "kudu/gutil/sysinfo.h"
+#include "gutil/sysinfo.h"
inline int64 CycleClock::Now() {
uint32 pmccntr;
uint32 pmuseren;
@@ -171,7 +171,7 @@ inline int64 CycleClock::Now() {
// ----------------------------------------------------------------
#elif defined(ARMV3)
-#include "kudu/gutil/sysinfo.h" // for CyclesPerSecond()
+#include "gutil/sysinfo.h" // for CyclesPerSecond()
inline int64 CycleClock::Now() {
struct timeval tv;
gettimeofday(&tv, NULL);
@@ -181,7 +181,7 @@ inline int64 CycleClock::Now() {
// ----------------------------------------------------------------
#elif defined(__mips__)
-#include "kudu/gutil/sysinfo.h"
+#include "gutil/sysinfo.h"
inline int64 CycleClock::Now() {
// mips apparently only allows rdtsc for superusers, so we fall
// back to gettimeofday. It's possible clock_gettime would be better.
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/endian.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/endian.h b/be/src/gutil/endian.h
index 5ed8f38..8cd0f18 100644
--- a/be/src/gutil/endian.h
+++ b/be/src/gutil/endian.h
@@ -32,9 +32,9 @@
#include <assert.h>
-#include "kudu/gutil/int128.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/port.h"
+#include "gutil/int128.h"
+#include "gutil/integral_types.h"
+#include "gutil/port.h"
inline uint64 gbswap_64(uint64 host_int) {
#if defined(__GNUC__) && defined(__x86_64__) && !defined(__APPLE__)
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/fixedarray.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/fixedarray.h b/be/src/gutil/fixedarray.h
index 3e9e072..4d54b6b 100644
--- a/be/src/gutil/fixedarray.h
+++ b/be/src/gutil/fixedarray.h
@@ -25,11 +25,11 @@
#include <stddef.h>
-#include <glog/logging.h>
+#include <common/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/manual_constructor.h"
+#include "gutil/logging-inl.h"
+#include "gutil/macros.h"
+#include "gutil/manual_constructor.h"
// A FixedArray<T> represents a non-resizable array of T where the
// length of the array does not need to be a compile time constant.
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/gscoped_ptr.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/gscoped_ptr.h b/be/src/gutil/gscoped_ptr.h
index eee1ec7..be1bb48 100644
--- a/be/src/gutil/gscoped_ptr.h
+++ b/be/src/gutil/gscoped_ptr.h
@@ -91,8 +91,8 @@
// some of the older compilers we have to support.
// -------------------------------------------------------------------------
-#ifndef KUDU_GUTIL_GSCOPED_PTR_H_
-#define KUDU_GUTIL_GSCOPED_PTR_H_
+#ifndef GUTIL_GSCOPED_PTR_H_
+#define GUTIL_GSCOPED_PTR_H_
// This is an implementation designed to match the anticipated future TR2
// implementation of the scoped_ptr class, and its closely-related brethren,
@@ -104,10 +104,10 @@
#include <algorithm> // For std::swap().
-#include "kudu/gutil/basictypes.h"
-#include "kudu/gutil/template_util.h"
-#include "kudu/gutil/type_traits.h"
-#include "kudu/gutil/move.h"
+#include "gutil/basictypes.h"
+#include "gutil/template_util.h"
+#include "gutil/type_traits.h"
+#include "gutil/move.h"
namespace kudu {
@@ -827,4 +827,4 @@ gscoped_ptr<T> make_gscoped_ptr(T* ptr) {
return gscoped_ptr<T>(ptr);
}
-#endif // KUDU_GUTIL_GSCOPED_PTR_H_
+#endif // GUTIL_GSCOPED_PTR_H_
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/builtin_type_hash.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/builtin_type_hash.h b/be/src/gutil/hash/builtin_type_hash.h
index c979eb2..173839b 100644
--- a/be/src/gutil/hash/builtin_type_hash.h
+++ b/be/src/gutil/hash/builtin_type_hash.h
@@ -10,10 +10,10 @@
#include <stddef.h>
#include <stdint.h>
-#include "kudu/gutil/casts.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/hash/jenkins_lookup2.h"
+#include "gutil/casts.h"
+#include "gutil/integral_types.h"
+#include "gutil/macros.h"
+#include "gutil/hash/jenkins_lookup2.h"
inline uint32 Hash32NumWithSeed(uint32 num, uint32 c) {
uint32 b = 0x9e3779b9UL; // the golden ratio; an arbitrary value
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/city.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/city.cc b/be/src/gutil/hash/city.cc
index cc00ff7..e9898a0 100644
--- a/be/src/gutil/hash/city.cc
+++ b/be/src/gutil/hash/city.cc
@@ -14,7 +14,7 @@
// optimize the code here by writing a program that systematically explores
// more of the space of possible hash functions, or by using SIMD instructions.
-#include "kudu/gutil/hash/city.h"
+#include "gutil/hash/city.h"
#include <sys/types.h>
#include <algorithm>
@@ -28,12 +28,12 @@ using std::swap;
using std::make_pair;
using std::pair;
-#include "kudu/gutil/int128.h"
-#include "kudu/gutil/integral_types.h"
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/hash/hash128to64.h"
-#include "kudu/gutil/endian.h"
+#include "gutil/int128.h"
+#include "gutil/integral_types.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/hash/hash128to64.h"
+#include "gutil/endian.h"
namespace util_hash {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/city.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/city.h b/be/src/gutil/hash/city.h
index e99202e..d5925e5 100644
--- a/be/src/gutil/hash/city.h
+++ b/be/src/gutil/hash/city.h
@@ -23,8 +23,8 @@
#include <stddef.h> // for size_t.
-#include "kudu/gutil/int128.h"
-#include "kudu/gutil/integral_types.h"
+#include "gutil/int128.h"
+#include "gutil/integral_types.h"
namespace util_hash {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/hash.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/hash.cc b/be/src/gutil/hash/hash.cc
index 92a8ca2..beceab3 100644
--- a/be/src/gutil/hash/hash.cc
+++ b/be/src/gutil/hash/hash.cc
@@ -7,13 +7,13 @@
// To find the implementation of the core Bob Jenkins lookup2 hash, look in
// jenkins.cc.
-#include "kudu/gutil/hash/hash.h"
+#include "gutil/hash/hash.h"
-#include "kudu/gutil/integral_types.h"
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/hash/jenkins.h"
-#include "kudu/gutil/hash/jenkins_lookup2.h"
+#include "gutil/integral_types.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/hash/jenkins.h"
+#include "gutil/hash/jenkins_lookup2.h"
// For components that ship code externally (notably the Google Search
// Appliance) we want to change the fingerprint function so that
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/hash.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/hash.h b/be/src/gutil/hash/hash.h
index 3c14f80..f6a8b0a 100644
--- a/be/src/gutil/hash/hash.h
+++ b/be/src/gutil/hash/hash.h
@@ -86,17 +86,17 @@ using __gnu_cxx::hash_set;
#include <string>
#include <utility>
-#include "kudu/gutil/casts.h"
-#include "kudu/gutil/int128.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/port.h"
-#include "kudu/gutil/hash/city.h"
-#include "kudu/gutil/hash/hash128to64.h"
-#include "kudu/gutil/hash/jenkins.h"
-#include "kudu/gutil/hash/jenkins_lookup2.h"
-#include "kudu/gutil/hash/legacy_hash.h"
-#include "kudu/gutil/hash/string_hash.h"
+#include "gutil/casts.h"
+#include "gutil/int128.h"
+#include "gutil/integral_types.h"
+#include "gutil/macros.h"
+#include "gutil/port.h"
+#include "gutil/hash/city.h"
+#include "gutil/hash/hash128to64.h"
+#include "gutil/hash/jenkins.h"
+#include "gutil/hash/jenkins_lookup2.h"
+#include "gutil/hash/legacy_hash.h"
+#include "gutil/hash/string_hash.h"
#include <ext/hash_set>
namespace __gnu_cxx {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/hash128to64.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/hash128to64.h b/be/src/gutil/hash/hash128to64.h
index 481a010..af95662 100644
--- a/be/src/gutil/hash/hash128to64.h
+++ b/be/src/gutil/hash/hash128to64.h
@@ -4,8 +4,8 @@
#ifndef UTIL_HASH_HASH128TO64_H_
#define UTIL_HASH_HASH128TO64_H_
-#include "kudu/gutil/int128.h"
-#include "kudu/gutil/integral_types.h"
+#include "gutil/int128.h"
+#include "gutil/integral_types.h"
// Hash 128 input bits down to 64 bits of output.
// This is intended to be a reasonably good hash function.
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/jenkins.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/jenkins.cc b/be/src/gutil/hash/jenkins.cc
index 70a7e30..5c19033 100644
--- a/be/src/gutil/hash/jenkins.cc
+++ b/be/src/gutil/hash/jenkins.cc
@@ -16,12 +16,12 @@
// to load words from memory a byte at a time. See gwshash.cc for an
// implementation that is compatible with Bob Jenkins' lookup2.c.
-#include "kudu/gutil/hash/jenkins.h"
+#include "gutil/hash/jenkins.h"
-#include "kudu/gutil/integral_types.h"
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/hash/jenkins_lookup2.h"
+#include "gutil/integral_types.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/hash/jenkins_lookup2.h"
static inline uint32 char2unsigned(char c) {
return static_cast<uint32>(static_cast<unsigned char>(c));
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/jenkins.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/jenkins.h b/be/src/gutil/hash/jenkins.h
index 90a47ed..6837a66 100644
--- a/be/src/gutil/hash/jenkins.h
+++ b/be/src/gutil/hash/jenkins.h
@@ -10,7 +10,7 @@
#ifndef UTIL_HASH_JENKINS_H_
#define UTIL_HASH_JENKINS_H_
-#include "kudu/gutil/integral_types.h"
+#include "gutil/integral_types.h"
// ----------------------------------------------------------------------
// Hash32StringWithSeed()
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/jenkins_lookup2.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/jenkins_lookup2.h b/be/src/gutil/hash/jenkins_lookup2.h
index e6ffa84..6793809 100644
--- a/be/src/gutil/hash/jenkins_lookup2.h
+++ b/be/src/gutil/hash/jenkins_lookup2.h
@@ -15,8 +15,8 @@
#ifndef UTIL_HASH_JENKINS_LOOKUP2_H_
#define UTIL_HASH_JENKINS_LOOKUP2_H_
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/port.h"
+#include "gutil/integral_types.h"
+#include "gutil/port.h"
// ----------------------------------------------------------------------
// mix()
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/legacy_hash.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/legacy_hash.h b/be/src/gutil/hash/legacy_hash.h
index 3a69336..5a93599 100644
--- a/be/src/gutil/hash/legacy_hash.h
+++ b/be/src/gutil/hash/legacy_hash.h
@@ -10,9 +10,9 @@
#ifndef UTIL_HASH_LEGACY_HASH_H_
#define UTIL_HASH_LEGACY_HASH_H_
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/hash/builtin_type_hash.h"
-#include "kudu/gutil/hash/string_hash.h"
+#include "gutil/integral_types.h"
+#include "gutil/hash/builtin_type_hash.h"
+#include "gutil/hash/string_hash.h"
// Hash8, Hash16 and Hash32 are for legacy use only.
typedef uint32 Hash32;
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/hash/string_hash.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/hash/string_hash.h b/be/src/gutil/hash/string_hash.h
index d8c20f3..4e39997 100644
--- a/be/src/gutil/hash/string_hash.h
+++ b/be/src/gutil/hash/string_hash.h
@@ -13,11 +13,11 @@
#include <stddef.h>
-#include "kudu/gutil/port.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/hash/city.h"
-#include "kudu/gutil/hash/jenkins.h"
-#include "kudu/gutil/hash/jenkins_lookup2.h"
+#include "gutil/port.h"
+#include "gutil/integral_types.h"
+#include "gutil/hash/city.h"
+#include "gutil/hash/jenkins.h"
+#include "gutil/hash/jenkins_lookup2.h"
namespace hash_internal {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/int128.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/int128.cc b/be/src/gutil/int128.cc
index eeaee2f..9e2ab18 100644
--- a/be/src/gutil/int128.cc
+++ b/be/src/gutil/int128.cc
@@ -6,8 +6,8 @@
#include <iostream>
using std::cout;
using std::endl;
-#include "kudu/gutil/int128.h"
-#include "kudu/gutil/integral_types.h"
+#include "gutil/int128.h"
+#include "gutil/integral_types.h"
const uint128_pod kuint128max = {
static_cast<uint64>(GG_LONGLONG(0xFFFFFFFFFFFFFFFF)),
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/int128.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/int128.h b/be/src/gutil/int128.h
index 2a19cca..72b87cd 100644
--- a/be/src/gutil/int128.h
+++ b/be/src/gutil/int128.h
@@ -7,7 +7,7 @@
#include <iosfwd>
using std::ostream;
-#include "kudu/gutil/integral_types.h"
+#include "gutil/integral_types.h"
struct uint128_pod;
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/macros.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/macros.h b/be/src/gutil/macros.h
index f271bd4..0318008 100644
--- a/be/src/gutil/macros.h
+++ b/be/src/gutil/macros.h
@@ -11,7 +11,7 @@
#define BASE_MACROS_H_
#include <stddef.h> // For size_t
-#include "kudu/gutil/port.h"
+#include "gutil/port.h"
// The swigged version of an abstract class must be concrete if any methods
// return objects of the abstract type. We keep it abstract in C++ and
@@ -39,6 +39,8 @@ template <bool>
struct CompileAssert {
};
+#ifndef COMPILE_ASSERT
+
#define COMPILE_ASSERT(expr, msg) \
typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1] ATTRIBUTE_UNUSED
@@ -82,6 +84,7 @@ struct CompileAssert {
//
// This is to avoid running into a bug in MS VC 7.1, which
// causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1.
+#endif // COMPILE_ASSERT
// A macro to disallow the copy constructor and operator= functions
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/manual_constructor.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/manual_constructor.h b/be/src/gutil/manual_constructor.h
index adcda07..1434f72 100644
--- a/be/src/gutil/manual_constructor.h
+++ b/be/src/gutil/manual_constructor.h
@@ -45,7 +45,7 @@
#include <stddef.h>
-#include "kudu/gutil/port.h"
+#include "gutil/port.h"
namespace base {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/map-util.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/map-util.h b/be/src/gutil/map-util.h
index 6fffedf..fb8d5c8 100644
--- a/be/src/gutil/map-util.h
+++ b/be/src/gutil/map-util.h
@@ -71,9 +71,9 @@ using std::pair;
#include <vector>
using std::vector;
-#include <glog/logging.h>
+#include <common/logging.h>
-#include "kudu/gutil/logging-inl.h"
+#include "gutil/logging-inl.h"
//
// Find*()
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/mathlimits.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/mathlimits.cc b/be/src/gutil/mathlimits.cc
index dcc261d..6d8e536 100644
--- a/be/src/gutil/mathlimits.cc
+++ b/be/src/gutil/mathlimits.cc
@@ -21,9 +21,9 @@
//
//
-#include "kudu/gutil/mathlimits.h"
+#include "gutil/mathlimits.h"
-#include "kudu/gutil/integral_types.h"
+#include "gutil/integral_types.h"
// MSVC++ 2005 thinks the header declaration was a definition, and
// erroneously flags these as a duplicate definition.
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/once.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/once.cc b/be/src/gutil/once.cc
index 1b97f8f..a59a8ef 100644
--- a/be/src/gutil/once.cc
+++ b/be/src/gutil/once.cc
@@ -1,10 +1,10 @@
// Copyright 2008 Google Inc. All Rights Reserved.
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/once.h"
-#include "kudu/gutil/dynamic_annotations.h"
-#include "kudu/gutil/spinlock_internal.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/once.h"
+#include "gutil/dynamic_annotations.h"
+#include "gutil/spinlock_internal.h"
// All modifications to a GoogleOnceType occur inside GoogleOnceInternalInit.
// The fast path reads the variable with an acquire-load..
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/once.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/once.h b/be/src/gutil/once.h
index ff161c5..c81e871 100644
--- a/be/src/gutil/once.h
+++ b/be/src/gutil/once.h
@@ -24,12 +24,12 @@
#ifndef BASE_ONCE_H_
#define BASE_ONCE_H_
-#include "kudu/gutil/atomicops.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/dynamic_annotations.h"
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/port.h"
-#include "kudu/gutil/type_traits.h"
+#include "gutil/atomicops.h"
+#include "gutil/integral_types.h"
+#include "gutil/dynamic_annotations.h"
+#include "gutil/macros.h"
+#include "gutil/port.h"
+#include "gutil/type_traits.h"
// The following enum values are not for use by clients
enum {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/paranoid.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/paranoid.h b/be/src/gutil/paranoid.h
index 01f34b7..6bd0b7a 100644
--- a/be/src/gutil/paranoid.h
+++ b/be/src/gutil/paranoid.h
@@ -6,9 +6,9 @@
#ifndef BASE_PARANOID_H_
#define BASE_PARANOID_H_
-#include <glog/logging.h>
+#include <common/logging.h>
-#include "kudu/gutil/logging-inl.h"
+#include "gutil/logging-inl.h"
// Sanitize a bool value which might be sour.
//
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/port.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/port.h b/be/src/gutil/port.h
index 6222cca..e204de7 100644
--- a/be/src/gutil/port.h
+++ b/be/src/gutil/port.h
@@ -18,7 +18,7 @@
#include <malloc.h> // for memalign()
#endif
-#include "kudu/gutil/integral_types.h"
+#include "gutil/integral_types.h"
// Must happens before inttypes.h inclusion */
#if defined(__APPLE__)
@@ -936,7 +936,7 @@ inline int isinf(double x) {
return 0;
}
-// #include "kudu/conflict-signal.h"
+// #include "conflict-signal.h"
typedef void (*sig_t)(int);
// These actually belong in errno.h but there's a name confilict in errno
@@ -980,7 +980,7 @@ typedef short int16_t;
#endif // _MSC_VER
#ifdef STL_MSVC // not always the same as _MSC_VER
-#include "kudu/base/port_hash.h"
+#include "base/port_hash.h"
#else
struct PortableHashBase { };
#endif
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/raw_scoped_refptr_mismatch_checker.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/raw_scoped_refptr_mismatch_checker.h b/be/src/gutil/raw_scoped_refptr_mismatch_checker.h
index 63e4e71..756cab8 100644
--- a/be/src/gutil/raw_scoped_refptr_mismatch_checker.h
+++ b/be/src/gutil/raw_scoped_refptr_mismatch_checker.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef KUDU_GUTIL_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
-#define KUDU_GUTIL_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
+#ifndef GUTIL_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
+#define GUTIL_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
#include <type_traits>
-#include "kudu/gutil/ref_counted.h"
+#include "gutil/ref_counted.h"
// It is dangerous to post a task with a T* argument where T is a subtype of
// RefCounted(Base|ThreadSafeBase), since by the time the parameter is used, the
@@ -60,4 +60,4 @@ struct ParamsUseScopedRefptrCorrectly<std::tuple<Head, Tail...>> {
} // namespace kudu
-#endif // KUDU_GUTIL_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
+#endif // GUTIL_RAW_SCOPED_REFPTR_MISMATCH_CHECKER_H_
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/ref_counted.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/ref_counted.cc b/be/src/gutil/ref_counted.cc
index a15a1e2..08c8dd2 100644
--- a/be/src/gutil/ref_counted.cc
+++ b/be/src/gutil/ref_counted.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "kudu/gutil/ref_counted.h"
+#include "gutil/ref_counted.h"
-#include <glog/logging.h>
-#include "kudu/gutil/threading/thread_collision_warner.h"
+#include <common/logging.h>
+#include "gutil/threading/thread_collision_warner.h"
namespace kudu {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/ref_counted.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/ref_counted.h b/be/src/gutil/ref_counted.h
index 8b6a553..59d0769 100644
--- a/be/src/gutil/ref_counted.h
+++ b/be/src/gutil/ref_counted.h
@@ -7,9 +7,9 @@
#include <cassert>
-#include "kudu/gutil/atomic_refcount.h"
-#include "kudu/gutil/port.h"
-#include "kudu/gutil/threading/thread_collision_warner.h"
+#include "gutil/atomic_refcount.h"
+#include "gutil/port.h"
+#include "gutil/threading/thread_collision_warner.h"
namespace kudu {
namespace subtle {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/ref_counted_memory.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/ref_counted_memory.cc b/be/src/gutil/ref_counted_memory.cc
index 1d695d9..b367f2a 100644
--- a/be/src/gutil/ref_counted_memory.cc
+++ b/be/src/gutil/ref_counted_memory.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "kudu/gutil/ref_counted_memory.h"
+#include "gutil/ref_counted_memory.h"
#include <stdlib.h>
-#include <glog/logging.h>
+#include <common/logging.h>
namespace kudu {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/ref_counted_memory.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/ref_counted_memory.h b/be/src/gutil/ref_counted_memory.h
index 550a142..ad51e83 100644
--- a/be/src/gutil/ref_counted_memory.h
+++ b/be/src/gutil/ref_counted_memory.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef KUDU_GUTIL_REF_COUNTED_MEMORY_H_
-#define KUDU_GUTIL_REF_COUNTED_MEMORY_H_
+#ifndef GUTIL_REF_COUNTED_MEMORY_H_
+#define GUTIL_REF_COUNTED_MEMORY_H_
#include <string>
#include <vector>
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/ref_counted.h"
-#include "kudu/gutil/port.h"
+#include "gutil/macros.h"
+#include "gutil/ref_counted.h"
+#include "gutil/port.h"
#ifndef BASE_EXPORT
#define BASE_EXPORT
@@ -147,4 +147,4 @@ class BASE_EXPORT RefCountedMallocedMemory : public RefCountedMemory {
} // namespace kudu
-#endif // KUDU_GUTIL_REF_COUNTED_MEMORY_H_
+#endif // GUTIL_REF_COUNTED_MEMORY_H_
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/singleton.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/singleton.h b/be/src/gutil/singleton.h
index 61e5ea5..ce58e13 100644
--- a/be/src/gutil/singleton.h
+++ b/be/src/gutil/singleton.h
@@ -59,10 +59,10 @@
#include <stddef.h>
-#include <glog/logging.h>
+#include <common/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/once.h"
+#include "gutil/logging-inl.h"
+#include "gutil/once.h"
namespace util {
namespace gtl {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/spinlock.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/spinlock.cc b/be/src/gutil/spinlock.cc
index 8a02c95..a5ca7c6 100644
--- a/be/src/gutil/spinlock.cc
+++ b/be/src/gutil/spinlock.cc
@@ -32,11 +32,11 @@
* Author: Sanjay Ghemawat
*/
-#include "kudu/gutil/spinlock.h"
-#include "kudu/gutil/synchronization_profiling.h"
-#include "kudu/gutil/spinlock_internal.h"
-#include "kudu/gutil/walltime.h"
-#include "kudu/gutil/sysinfo.h" /* for NumCPUs() */
+#include "gutil/spinlock.h"
+#include "gutil/synchronization_profiling.h"
+#include "gutil/spinlock_internal.h"
+#include "gutil/walltime.h"
+#include "gutil/sysinfo.h" /* for NumCPUs() */
namespace base {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/spinlock.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/spinlock.h b/be/src/gutil/spinlock.h
index fcd6287..3cf7d3e 100644
--- a/be/src/gutil/spinlock.h
+++ b/be/src/gutil/spinlock.h
@@ -39,10 +39,10 @@
#ifndef BASE_SPINLOCK_H_
#define BASE_SPINLOCK_H_
-#include "kudu/gutil/atomicops.h"
-#include "kudu/gutil/basictypes.h"
-#include "kudu/gutil/dynamic_annotations.h"
-#include "kudu/gutil/thread_annotations.h"
+#include "gutil/atomicops.h"
+#include "gutil/basictypes.h"
+#include "gutil/dynamic_annotations.h"
+#include "gutil/thread_annotations.h"
// This isn't originally in the base:: namespace in tcmalloc,
// but tcmalloc inadvertently exports these symbols. So, if we
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/spinlock_internal.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/spinlock_internal.cc b/be/src/gutil/spinlock_internal.cc
index 151b0dd..0850cf1 100644
--- a/be/src/gutil/spinlock_internal.cc
+++ b/be/src/gutil/spinlock_internal.cc
@@ -41,17 +41,17 @@
// In all cases, it must return in bounded time even if SpinlockWake() is not
// called.
-#include "kudu/gutil/spinlock_internal.h"
+#include "gutil/spinlock_internal.h"
// forward declaration for use by spinlock_*-inl.h
namespace base { namespace internal { static int SuggestedDelayNS(int loop); }}
#if defined(_WIN32)
-#include "kudu/gutil/spinlock_win32-inl.h"
+#include "gutil/spinlock_win32-inl.h"
#elif defined(__linux__)
-#include "kudu/gutil/spinlock_linux-inl.h"
+#include "gutil/spinlock_linux-inl.h"
#else
-#include "kudu/gutil/spinlock_posix-inl.h"
+#include "gutil/spinlock_posix-inl.h"
#endif
namespace base {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/spinlock_internal.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/spinlock_internal.h b/be/src/gutil/spinlock_internal.h
index c235893..a7f5150 100644
--- a/be/src/gutil/spinlock_internal.h
+++ b/be/src/gutil/spinlock_internal.h
@@ -36,8 +36,8 @@
#ifndef BASE_SPINLOCK_INTERNAL_H_
#define BASE_SPINLOCK_INTERNAL_H_
-#include "kudu/gutil/basictypes.h"
-#include "kudu/gutil/atomicops.h"
+#include "gutil/basictypes.h"
+#include "gutil/atomicops.h"
namespace base {
namespace internal {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/spinlock_linux-inl.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/spinlock_linux-inl.h b/be/src/gutil/spinlock_linux-inl.h
index 41ef03a..c9838e4 100644
--- a/be/src/gutil/spinlock_linux-inl.h
+++ b/be/src/gutil/spinlock_linux-inl.h
@@ -36,7 +36,7 @@
#include <sched.h>
#include <time.h>
#include <limits.h>
-#include "kudu/gutil/linux_syscall_support.h"
+#include "gutil/linux_syscall_support.h"
#define FUTEX_WAIT 0
#define FUTEX_WAKE 1
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/stl_util.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/stl_util.h b/be/src/gutil/stl_util.h
index 60cb587..7e72b25 100644
--- a/be/src/gutil/stl_util.h
+++ b/be/src/gutil/stl_util.h
@@ -52,9 +52,9 @@ using std::string;
#include <vector>
using std::vector;
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/port.h"
+#include "gutil/integral_types.h"
+#include "gutil/macros.h"
+#include "gutil/port.h"
// Sort and remove duplicates of an STL vector or deque.
template<class T>
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/stringprintf.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/stringprintf.cc b/be/src/gutil/stringprintf.cc
index 112605c..13939fe 100644
--- a/be/src/gutil/stringprintf.cc
+++ b/be/src/gutil/stringprintf.cc
@@ -1,15 +1,15 @@
// Copyright 2002 and onwards Google Inc.
-#include "kudu/gutil/stringprintf.h"
+#include "gutil/stringprintf.h"
#include <errno.h>
#include <stdarg.h> // For va_list and related operations
#include <stdio.h> // MSVC requires this for _vsnprintf
#include <vector>
using std::vector;
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/macros.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/macros.h"
#ifdef _MSC_VER
enum { IS__MSC_VER = 1 };
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/stringprintf.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/stringprintf.h b/be/src/gutil/stringprintf.h
index 2083574..e486e72 100644
--- a/be/src/gutil/stringprintf.h
+++ b/be/src/gutil/stringprintf.h
@@ -16,7 +16,7 @@ using std::string;
#include <vector>
using std::vector;
-#include "kudu/gutil/port.h"
+#include "gutil/port.h"
// Return a C++ string
extern string StringPrintf(const char* format, ...)
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/ascii_ctype.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/ascii_ctype.cc b/be/src/gutil/strings/ascii_ctype.cc
index 50ea8c2..44608f8 100644
--- a/be/src/gutil/strings/ascii_ctype.cc
+++ b/be/src/gutil/strings/ascii_ctype.cc
@@ -4,7 +4,7 @@
// The C++ style guide requires 80-column lines.
// cpplint.py requires 2-space indentation.
-#include "kudu/gutil/strings/ascii_ctype.h"
+#include "gutil/strings/ascii_ctype.h"
// # Table generated by this Python code (bit 0x02 is currently unused):
// def Hex2(n):
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/charset.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/charset.cc b/be/src/gutil/strings/charset.cc
index 2e9d5b1..7725b0f 100644
--- a/be/src/gutil/strings/charset.cc
+++ b/be/src/gutil/strings/charset.cc
@@ -1,6 +1,6 @@
// Copyright 2008 Google Inc. All Rights Reserved.
-#include "kudu/gutil/strings/charset.h"
+#include "gutil/strings/charset.h"
#include <string.h>
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/charset.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/charset.h b/be/src/gutil/strings/charset.h
index a2dbca4..b6b7013 100644
--- a/be/src/gutil/strings/charset.h
+++ b/be/src/gutil/strings/charset.h
@@ -3,7 +3,7 @@
#ifndef STRINGS_CHARSET_H_
#define STRINGS_CHARSET_H_
-#include "kudu/gutil/integral_types.h"
+#include "gutil/integral_types.h"
namespace strings {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/escaping.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/escaping.cc b/be/src/gutil/strings/escaping.cc
index cf49359..adb8093 100644
--- a/be/src/gutil/strings/escaping.cc
+++ b/be/src/gutil/strings/escaping.cc
@@ -1,7 +1,7 @@
// Copyright 2008 Google Inc. All Rights Reserved.
// Authors: Numerous. See the .h for contact people.
-#include "kudu/gutil/strings/escaping.h"
+#include "gutil/strings/escaping.h"
#include <assert.h>
#include <stdio.h>
@@ -12,13 +12,13 @@ using std::numeric_limits;
#include <vector>
using std::vector;
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/port.h"
-#include "kudu/gutil/gscoped_ptr.h"
-#include "kudu/gutil/strings/join.h"
-#include "kudu/gutil/utf/utf.h" // for runetochar
-#include "kudu/gutil/charmap.h"
-#include "kudu/gutil/stl_util.h"
+#include "gutil/integral_types.h"
+#include "gutil/port.h"
+#include "gutil/gscoped_ptr.h"
+#include "gutil/strings/join.h"
+#include "gutil/utf/utf.h" // for runetochar
+#include "gutil/charmap.h"
+#include "gutil/stl_util.h"
namespace strings {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/escaping.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/escaping.h b/be/src/gutil/strings/escaping.h
index 19e0860..67485ca 100644
--- a/be/src/gutil/strings/escaping.h
+++ b/be/src/gutil/strings/escaping.h
@@ -27,12 +27,12 @@ using std::string;
#include <vector>
using std::vector;
-#include <glog/logging.h>
+#include <common/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/strings/ascii_ctype.h"
-#include "kudu/gutil/strings/charset.h"
-#include "kudu/gutil/strings/stringpiece.h"
+#include "gutil/logging-inl.h"
+#include "gutil/strings/ascii_ctype.h"
+#include "gutil/strings/charset.h"
+#include "gutil/strings/stringpiece.h"
namespace strings {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/fastmem.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/fastmem.h b/be/src/gutil/strings/fastmem.h
index 3beca6d..ec84071 100644
--- a/be/src/gutil/strings/fastmem.h
+++ b/be/src/gutil/strings/fastmem.h
@@ -22,8 +22,8 @@
#include <stdio.h>
#include <string.h>
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/port.h"
+#include "gutil/integral_types.h"
+#include "gutil/port.h"
namespace strings {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/human_readable.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/human_readable.cc b/be/src/gutil/strings/human_readable.cc
index fb3419a..db31c65 100644
--- a/be/src/gutil/strings/human_readable.cc
+++ b/be/src/gutil/strings/human_readable.cc
@@ -1,15 +1,15 @@
// Copyright 2007 Google Inc. All Rights Reserved.
-#include "kudu/gutil/strings/human_readable.h"
+#include "gutil/strings/human_readable.h"
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/stringprintf.h"
-#include "kudu/gutil/strings/strip.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/stringprintf.h"
+#include "gutil/strings/strip.h"
namespace {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/human_readable.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/human_readable.h b/be/src/gutil/strings/human_readable.h
index e05b169..8a05907 100644
--- a/be/src/gutil/strings/human_readable.h
+++ b/be/src/gutil/strings/human_readable.h
@@ -12,9 +12,9 @@ using std::less;
#include <string>
using std::string;
-#include "kudu/gutil/basictypes.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/macros.h"
+#include "gutil/basictypes.h"
+#include "gutil/integral_types.h"
+#include "gutil/macros.h"
// WARNING
// HumanReadable{NumBytes, Int} don't give you the standard set of SI prefixes.
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/join.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/join.cc b/be/src/gutil/strings/join.cc
index c0035e1..e37d163 100644
--- a/be/src/gutil/strings/join.cc
+++ b/be/src/gutil/strings/join.cc
@@ -1,12 +1,12 @@
// Copyright 2008 and onwards Google Inc. All rights reserved.
-#include "kudu/gutil/strings/join.h"
+#include "gutil/strings/join.h"
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/gscoped_ptr.h"
-#include "kudu/gutil/strings/ascii_ctype.h"
-#include "kudu/gutil/strings/escaping.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/gscoped_ptr.h"
+#include "gutil/strings/ascii_ctype.h"
+#include "gutil/strings/escaping.h"
// ----------------------------------------------------------------------
// JoinUsing()
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/join.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/join.h b/be/src/gutil/strings/join.h
index 4369c4c..bd34c39 100644
--- a/be/src/gutil/strings/join.h
+++ b/be/src/gutil/strings/join.h
@@ -32,13 +32,13 @@ using std::pair;
#include <vector>
using std::vector;
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/template_util.h"
-#include "kudu/gutil/strings/numbers.h"
-#include "kudu/gutil/strings/strcat.h" // For backward compatibility.
-#include "kudu/gutil/strings/stringpiece.h"
-#include "kudu/gutil/hash/hash.h"
+#include "gutil/integral_types.h"
+#include "gutil/macros.h"
+#include "gutil/template_util.h"
+#include "gutil/strings/numbers.h"
+#include "gutil/strings/strcat.h" // For backward compatibility.
+#include "gutil/strings/stringpiece.h"
+#include "gutil/hash/hash.h"
// ----------------------------------------------------------------------
// JoinUsing()
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/memutil.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/memutil.cc b/be/src/gutil/strings/memutil.cc
index 390d2a0..ace02b3 100644
--- a/be/src/gutil/strings/memutil.cc
+++ b/be/src/gutil/strings/memutil.cc
@@ -2,11 +2,11 @@
// Copyright (C) 2001 and onwards Google, Inc.
//
-#include "kudu/gutil/strings/memutil.h"
+#include "gutil/strings/memutil.h"
#include <stdlib.h> // for malloc, NULL
-#include "kudu/gutil/strings/ascii_ctype.h" // for ascii_tolower
+#include "gutil/strings/ascii_ctype.h" // for ascii_tolower
int memcasecmp(const char *s1, const char *s2, size_t len) {
const unsigned char *us1 = reinterpret_cast<const unsigned char *>(s1);
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/memutil.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/memutil.h b/be/src/gutil/strings/memutil.h
index 9335735..b230149 100644
--- a/be/src/gutil/strings/memutil.h
+++ b/be/src/gutil/strings/memutil.h
@@ -56,7 +56,7 @@
#include <stddef.h>
#include <string.h> // to get the POSIX mem*() routines
-#include "kudu/gutil/port.h" // disable some warnings on Windows
+#include "gutil/port.h" // disable some warnings on Windows
inline char *memcat(char *dest, size_t destlen,
const char *src, size_t srclen) {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/numbers.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/numbers.cc b/be/src/gutil/strings/numbers.cc
index 7bdb57c..c7f7d19 100644
--- a/be/src/gutil/strings/numbers.cc
+++ b/be/src/gutil/strings/numbers.cc
@@ -4,7 +4,7 @@
// This file contains string processing functions related to
// numeric values.
-#include "kudu/gutil/strings/numbers.h"
+#include "gutil/strings/numbers.h"
#include <assert.h>
#include <ctype.h>
@@ -19,14 +19,14 @@ using std::numeric_limits;
#include <string>
using std::string;
-#include "kudu/gutil/int128.h"
-#include "kudu/gutil/integral_types.h"
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/gscoped_ptr.h"
-#include "kudu/gutil/stringprintf.h"
-#include "kudu/gutil/strtoint.h"
-#include "kudu/gutil/strings/ascii_ctype.h"
+#include "gutil/int128.h"
+#include "gutil/integral_types.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/gscoped_ptr.h"
+#include "gutil/stringprintf.h"
+#include "gutil/strtoint.h"
+#include "gutil/strings/ascii_ctype.h"
// Reads a <double> in *text, which may not be whitespace-initiated.
// *len is the length, or -1 if text is '\0'-terminated, which is more
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/numbers.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/numbers.h b/be/src/gutil/strings/numbers.h
index e9f5c1a..f035f23 100644
--- a/be/src/gutil/strings/numbers.h
+++ b/be/src/gutil/strings/numbers.h
@@ -20,11 +20,11 @@ using std::string;
#include <vector>
using std::vector;
-#include "kudu/gutil/int128.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/port.h"
-#include "kudu/gutil/stringprintf.h"
+#include "gutil/int128.h"
+#include "gutil/integral_types.h"
+#include "gutil/macros.h"
+#include "gutil/port.h"
+#include "gutil/stringprintf.h"
// START DOXYGEN NumbersFunctions grouping
@@ -540,36 +540,36 @@ bool ParseDoubleRange(const char* text, int len, const char** end,
// These functions are deprecated.
// Do not use in new code.
-// DEPRECATED(wadetregaskis). Just call StringPrintf or SimpleFtoa.
-string FloatToString(float f, const char* format);
+// // DEPRECATED(wadetregaskis). Just call StringPrintf or SimpleFtoa.
+// string FloatToString(float f, const char* format);
-// DEPRECATED(wadetregaskis). Just call StringPrintf or SimpleItoa.
-string IntToString(int i, const char* format);
+// // DEPRECATED(wadetregaskis). Just call StringPrintf or SimpleItoa.
+// string IntToString(int i, const char* format);
-// DEPRECATED(wadetregaskis). Just call StringPrintf or SimpleItoa.
-string Int64ToString(int64 i64, const char* format);
+// // DEPRECATED(wadetregaskis). Just call StringPrintf or SimpleItoa.
+// string Int64ToString(int64 i64, const char* format);
-// DEPRECATED(wadetregaskis). Just call StringPrintf or SimpleItoa.
-string UInt64ToString(uint64 ui64, const char* format);
+// // DEPRECATED(wadetregaskis). Just call StringPrintf or SimpleItoa.
+// string UInt64ToString(uint64 ui64, const char* format);
-// DEPRECATED(wadetregaskis). Just call StringPrintf.
-inline string FloatToString(float f) {
- return StringPrintf("%7f", f);
-}
+// // DEPRECATED(wadetregaskis). Just call StringPrintf.
+// inline string FloatToString(float f) {
+// return StringPrintf("%7f", f);
+// }
-// DEPRECATED(wadetregaskis). Just call StringPrintf.
-inline string IntToString(int i) {
- return StringPrintf("%7d", i);
-}
+// // DEPRECATED(wadetregaskis). Just call StringPrintf.
+// inline string IntToString(int i) {
+// return StringPrintf("%7d", i);
+// }
-// DEPRECATED(wadetregaskis). Just call StringPrintf.
-inline string Int64ToString(int64 i64) {
- return StringPrintf("%7" PRId64, i64);
-}
+// // DEPRECATED(wadetregaskis). Just call StringPrintf.
+// inline string Int64ToString(int64 i64) {
+// return StringPrintf("%7" PRId64, i64);
+// }
-// DEPRECATED(wadetregaskis). Just call StringPrintf.
-inline string UInt64ToString(uint64 ui64) {
- return StringPrintf("%7" PRIu64, ui64);
-}
+// // DEPRECATED(wadetregaskis). Just call StringPrintf.
+// inline string UInt64ToString(uint64 ui64) {
+// return StringPrintf("%7" PRIu64, ui64);
+// }
#endif // STRINGS_NUMBERS_H_
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/serialize.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/serialize.cc b/be/src/gutil/strings/serialize.cc
index 5449ef7..a4e27c3 100644
--- a/be/src/gutil/strings/serialize.cc
+++ b/be/src/gutil/strings/serialize.cc
@@ -1,6 +1,6 @@
// Copyright 2003, Google Inc. All rights reserved.
-#include "kudu/gutil/strings/serialize.h"
+#include "gutil/strings/serialize.h"
#include <stddef.h>
#include <stdlib.h>
@@ -15,13 +15,13 @@ using std::pair;
#include <vector>
using std::vector;
-#include "kudu/gutil/casts.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/stringprintf.h"
-#include "kudu/gutil/strtoint.h"
-#include "kudu/gutil/strings/join.h"
-#include "kudu/gutil/strings/split.h"
-#include "kudu/gutil/hash/hash.h"
+#include "gutil/casts.h"
+#include "gutil/integral_types.h"
+#include "gutil/stringprintf.h"
+#include "gutil/strtoint.h"
+#include "gutil/strings/join.h"
+#include "gutil/strings/split.h"
+#include "gutil/hash/hash.h"
// Convert a uint32 to a 4-byte string.
string Uint32ToKey(uint32 u32) {
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/serialize.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/serialize.h b/be/src/gutil/strings/serialize.h
index 7966cd2..d69382a 100644
--- a/be/src/gutil/strings/serialize.h
+++ b/be/src/gutil/strings/serialize.h
@@ -19,15 +19,15 @@ using std::pair;
#include <vector>
using std::vector;
-#include <glog/logging.h>
-
-#include "kudu/gutil/int128.h"
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/type_traits.h"
-#include "kudu/gutil/strings/stringpiece.h"
-#include "kudu/gutil/endian.h"
-#include "kudu/gutil/stl_util.h"
+#include <common/logging.h>
+
+#include "gutil/int128.h"
+#include "gutil/integral_types.h"
+#include "gutil/logging-inl.h"
+#include "gutil/type_traits.h"
+#include "gutil/strings/stringpiece.h"
+#include "gutil/endian.h"
+#include "gutil/stl_util.h"
// Converts a 4-byte uint32 to a string such that the string keys sort in
// the same order as the original uint32 value.
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/split.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/split.cc b/be/src/gutil/strings/split.cc
index a42faa7..34a9d99 100644
--- a/be/src/gutil/strings/split.cc
+++ b/be/src/gutil/strings/split.cc
@@ -2,7 +2,7 @@
//
// Maintainer: Greg Miller <jg...@google.com>
-#include "kudu/gutil/strings/split.h"
+#include "gutil/strings/split.h"
#include <assert.h>
#include <stdlib.h>
@@ -13,14 +13,14 @@ using std::iterator_traits;
#include <limits>
using std::numeric_limits;
-#include "kudu/gutil/integral_types.h"
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/macros.h"
-#include "kudu/gutil/strtoint.h"
-#include "kudu/gutil/strings/ascii_ctype.h"
-#include "kudu/gutil/strings/util.h"
-#include "kudu/gutil/hash/hash.h"
+#include "gutil/integral_types.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/macros.h"
+#include "gutil/strtoint.h"
+#include "gutil/strings/ascii_ctype.h"
+#include "gutil/strings/util.h"
+#include "gutil/hash/hash.h"
// Implementations for some of the Split2 API. Much of the Split2 API is
// templated so it exists in header files, either strings/split.h or
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/split.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/split.h b/be/src/gutil/strings/split.h
index c487689..e2f74a7 100644
--- a/be/src/gutil/strings/split.h
+++ b/be/src/gutil/strings/split.h
@@ -51,14 +51,14 @@ using std::pair;
#include <vector>
using std::vector;
-#include <glog/logging.h>
+#include <common/logging.h>
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/strings/charset.h"
-#include "kudu/gutil/strings/split_internal.h"
-#include "kudu/gutil/strings/stringpiece.h"
-#include "kudu/gutil/strings/strip.h"
+#include "gutil/integral_types.h"
+#include "gutil/logging-inl.h"
+#include "gutil/strings/charset.h"
+#include "gutil/strings/split_internal.h"
+#include "gutil/strings/stringpiece.h"
+#include "gutil/strings/strip.h"
namespace strings {
@@ -854,11 +854,11 @@ bool SplitRange(const char* rangestr, int* from, int* to);
// The following variants of SplitCSVLine() are not recommended for new code.
// Please consider the CSV parser in //util/csv as an alternative. Examples:
// To parse a single line:
-// #include "kudu/util/csv/parser.h"
+// #include "util/csv/parser.h"
// vector<string> fields = util::csv::ParseLine(line).fields();
//
// To parse an entire file:
-// #include "kudu/util/csv/parser.h"
+// #include "util/csv/parser.h"
// for (Record rec : Parser(source)) {
// vector<string> fields = rec.fields();
// }
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/split_internal.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/split_internal.h b/be/src/gutil/strings/split_internal.h
index 01b3fac..38e3d01 100644
--- a/be/src/gutil/strings/split_internal.h
+++ b/be/src/gutil/strings/split_internal.h
@@ -26,8 +26,8 @@ using std::multimap;
#include <vector>
using std::vector;
-#include "kudu/gutil/port.h" // for LANG_CXX11
-#include "kudu/gutil/strings/stringpiece.h"
+#include "gutil/port.h" // for LANG_CXX11
+#include "gutil/strings/stringpiece.h"
#ifdef LANG_CXX11
// This must be included after "base/port.h", which defines LANG_CXX11.
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/strcat.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/strcat.cc b/be/src/gutil/strings/strcat.cc
index 93f8114..b91fab9 100644
--- a/be/src/gutil/strings/strcat.cc
+++ b/be/src/gutil/strings/strcat.cc
@@ -1,18 +1,18 @@
// Copyright 2008 and onwards Google Inc. All rights reserved.
-#include "kudu/gutil/strings/strcat.h"
+#include "gutil/strings/strcat.h"
#include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <glog/logging.h>
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/gscoped_ptr.h"
-#include "kudu/gutil/strings/ascii_ctype.h"
-#include "kudu/gutil/strings/escaping.h"
-#include "kudu/gutil/stl_util.h"
+#include <common/logging.h>
+#include "gutil/logging-inl.h"
+#include "gutil/gscoped_ptr.h"
+#include "gutil/strings/ascii_ctype.h"
+#include "gutil/strings/escaping.h"
+#include "gutil/stl_util.h"
AlphaNum gEmptyAlphaNum("");
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/strcat.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/strcat.h b/be/src/gutil/strings/strcat.h
index 40b888b..4493a0b 100644
--- a/be/src/gutil/strings/strcat.h
+++ b/be/src/gutil/strings/strcat.h
@@ -10,9 +10,9 @@
#include <string>
using std::string;
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/strings/numbers.h"
-#include "kudu/gutil/strings/stringpiece.h"
+#include "gutil/integral_types.h"
+#include "gutil/strings/numbers.h"
+#include "gutil/strings/stringpiece.h"
// The AlphaNum type was designed to be used as the parameter type for StrCat().
// I suppose that any routine accepting either a string or a number could accept
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/string_util-test.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/string_util-test.cc b/be/src/gutil/strings/string_util-test.cc
index 8849ca2..4d68e22 100644
--- a/be/src/gutil/strings/string_util-test.cc
+++ b/be/src/gutil/strings/string_util-test.cc
@@ -16,7 +16,7 @@
// under the License.
//
// Some portions Copyright 2013 The Chromium Authors. All rights reserved.
-#include "kudu/gutil/strings/util.h"
+#include "gutil/strings/util.h"
#include <gtest/gtest.h>
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/stringpiece.cc
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/stringpiece.cc b/be/src/gutil/strings/stringpiece.cc
index d6f23ee..73a6690 100644
--- a/be/src/gutil/strings/stringpiece.cc
+++ b/be/src/gutil/strings/stringpiece.cc
@@ -2,18 +2,18 @@
//
//
-#include "kudu/gutil/strings/stringpiece.h"
+#include "gutil/strings/stringpiece.h"
#include <algorithm>
#include <climits>
-#include <glog/logging.h>
+#include <common/logging.h>
#include <string.h>
#include <string>
-#include "kudu/gutil/hash/hash.h"
-#include "kudu/gutil/logging-inl.h"
-#include "kudu/gutil/stl_util.h"
-#include "kudu/gutil/strings/memutil.h"
+#include "gutil/hash/hash.h"
+#include "gutil/logging-inl.h"
+#include "gutil/stl_util.h"
+#include "gutil/strings/memutil.h"
using std::copy;
using std::max;
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/23100102/be/src/gutil/strings/stringpiece.h
----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/stringpiece.h b/be/src/gutil/strings/stringpiece.h
index 0f28f2b..0f59b38 100644
--- a/be/src/gutil/strings/stringpiece.h
+++ b/be/src/gutil/strings/stringpiece.h
@@ -121,11 +121,11 @@
#include <string.h>
#include <string>
-#include "kudu/gutil/integral_types.h"
-#include "kudu/gutil/port.h"
-#include "kudu/gutil/type_traits.h"
-#include "kudu/gutil/strings/fastmem.h"
-#include "kudu/gutil/hash/hash.h"
+#include "gutil/integral_types.h"
+#include "gutil/port.h"
+#include "gutil/type_traits.h"
+#include "gutil/strings/fastmem.h"
+#include "gutil/hash/hash.h"
class StringPiece {
private: