File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ uint64_t MixingHashState::CombineLargeContiguousImpl32(
4444uint64_t MixingHashState::CombineLargeContiguousImpl64 (
4545 uint64_t state, const unsigned char * first, size_t len) {
4646 while (len >= PiecewiseChunkSize ()) {
47- state = Mix (state ^ Hash64 (first, PiecewiseChunkSize ()), kMul );
47+ state = Hash64 (first, PiecewiseChunkSize (), state );
4848 len -= PiecewiseChunkSize ();
4949 first += PiecewiseChunkSize ();
5050 }
Original file line number Diff line number Diff line change @@ -1324,12 +1324,13 @@ class ABSL_DLL MixingHashState : public HashStateBase<MixingHashState> {
13241324 }
13251325
13261326 ABSL_ATTRIBUTE_ALWAYS_INLINE static uint64_t Hash64 (const unsigned char * data,
1327- size_t len) {
1327+ size_t len,
1328+ uint64_t state) {
13281329#ifdef ABSL_HAVE_INTRINSIC_INT128
1329- return LowLevelHashLenGt32 (data, len, Seed () );
1330+ return LowLevelHashLenGt32 (data, len, state );
13301331#else
13311332 return hash_internal::CityHash64WithSeed (
1332- reinterpret_cast <const char *>(data), len, Seed () );
1333+ reinterpret_cast <const char *>(data), len, state );
13331334#endif
13341335 }
13351336
@@ -1399,7 +1400,7 @@ inline uint64_t MixingHashState::CombineContiguousImpl(
13991400 return CombineContiguousImpl17to32 (state, first, len);
14001401 }
14011402 if (ABSL_PREDICT_TRUE (len <= PiecewiseChunkSize ())) {
1402- return Mix (state ^ Hash64 (first, len), kMul );
1403+ return Hash64 (first, len, state );
14031404 }
14041405 return CombineLargeContiguousImpl64 (state, first, len);
14051406}
You can’t perform that action at this time.
0 commit comments