|
1 | | -From e40cddd160fbec51b3309bb56c72a3258bfe69b6 Mon Sep 17 00:00:00 2001 |
| 1 | +From dcd5910ddff22b2896dc5221eab766a6c6d2307d Mon Sep 17 00:00:00 2001 |
2 | 2 | From: Tongxuan Liu <tongxuan.ltx@alibaba-inc.com> |
3 | 3 | Date: Mon, 13 Mar 2023 08:58:56 +0800 |
4 | | -Subject: [PATCH] [PATCH] Avoid fetching nullptr when use feature filter. |
| 4 | +Subject: [PATCH] Avoid fetching nullptr when use feature filter. |
5 | 5 |
|
6 | 6 | --- |
7 | 7 | Makefile | 13 +- |
8 | 8 | sparsehash/dense_hash_map_lockless | 447 ++++ |
9 | | - sparsehash/dense_hash_set_lockless | 381 ++++ |
| 9 | + sparsehash/dense_hash_set_lockless | 381 +++ |
10 | 10 | sparsehash/internal/densehashtable.h | 16 +- |
11 | | - sparsehash/internal/densehashtable_lockless.h | 2032 +++++++++++++++++ |
| 11 | + sparsehash/internal/densehashtable_lockless.h | 2033 +++++++++++++++++ |
12 | 12 | sparsehash/internal/hashtable-common.h | 4 + |
13 | 13 | sparsehash/internal/sparsehashtable.h | 18 +- |
14 | 14 | sparsehash/traits | 10 +- |
15 | 15 | tests/bench_lockless.cc | 1466 ++++++++++++ |
16 | 16 | tests/dense_hash_map_unittests.cc | 137 +- |
17 | 17 | tests/rwlock.h | 224 ++ |
18 | | - 11 files changed, 4725 insertions(+), 23 deletions(-) |
| 18 | + 11 files changed, 4726 insertions(+), 23 deletions(-) |
19 | 19 | create mode 100644 sparsehash/dense_hash_map_lockless |
20 | 20 | create mode 100644 sparsehash/dense_hash_set_lockless |
21 | 21 | create mode 100644 sparsehash/internal/densehashtable_lockless.h |
@@ -958,10 +958,10 @@ index e254126..3bc3c16 100644 |
958 | 958 | for (; dist > 0; --dist, ++f) { |
959 | 959 | diff --git a/sparsehash/internal/densehashtable_lockless.h b/sparsehash/internal/densehashtable_lockless.h |
960 | 960 | new file mode 100644 |
961 | | -index 0000000..c13c628 |
| 961 | +index 0000000..64f677f |
962 | 962 | --- /dev/null |
963 | 963 | +++ b/sparsehash/internal/densehashtable_lockless.h |
964 | | -@@ -0,0 +1,2032 @@ |
| 964 | +@@ -0,0 +1,2033 @@ |
965 | 965 | +// Copyright (c) 2005, Google Inc. |
966 | 966 | +// All rights reserved. |
967 | 967 | +// |
@@ -2204,7 +2204,8 @@ index 0000000..c13c628 |
2204 | 2204 | + }else if(test_deleted(bucknum, tmp_pointer)) { |
2205 | 2205 | + if(insert_pos == ILLEGAL_BUCKET) insert_pos = bucknum; |
2206 | 2206 | + }else if (equals(key, get_key(tmp_pointer->table_[bucknum]))) { |
2207 | | -+ std::pair<K, T> tmp(key, tmp_pointer->table_[bucknum].second); |
| 2207 | ++ std::pair<K, T> tmp(tmp_pointer->table_[bucknum].first, |
| 2208 | ++ tmp_pointer->table_[bucknum].second); |
2208 | 2209 | + if(tmp.first == key){ |
2209 | 2210 | + return tmp; |
2210 | 2211 | + }else{ |
@@ -4949,5 +4950,5 @@ index 0000000..25e8e93 |
4949 | 4950 | +}; |
4950 | 4951 | \ No newline at end of file |
4951 | 4952 | -- |
4952 | | -2.37.1 |
| 4953 | +2.25.1 |
4953 | 4954 |
|
0 commit comments