Skip to content

Commit 7f56aad

Browse files
authored
cleanup: Use absl::linked_hash_map instead quiche::QuicheLinkedHashMap (#43871)
Commit Message: Use absl::linked_hash_map instead quiche::QuicheLinkedHashMap Additional Description: The latter is a fork of the former. Risk Level: Low Testing: no-op change Docs Changes: no-op change Release Notes: N/A Platform Specific Features: N/A --------- Signed-off-by: Victor Vasiliev <vasilvv@google.com>
1 parent db35b55 commit 7f56aad

8 files changed

Lines changed: 11 additions & 11 deletions

File tree

source/common/common/BUILD

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ envoy_cc_library(
181181
"//envoy/filesystem:filesystem_interface",
182182
"//source/common/config:ttl_lib",
183183
"@abseil-cpp//absl/cleanup",
184-
"@quiche//:quic_platform",
185-
"@quiche//:quiche_common_lib",
184+
"@abseil-cpp//absl/container:linked_hash_map",
186185
],
187186
)
188187

source/common/common/key_value_store_base.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "source/common/common/logger.h"
1010
#include "source/common/config/ttl.h"
1111

12-
#include "quiche/common/quiche_linked_hash_map.h"
12+
#include "absl/container/linked_hash_map.h"
1313

1414
namespace Envoy {
1515
inline constexpr absl::string_view KV_STORE_TTL_KEY = "TTL";
@@ -47,7 +47,7 @@ class KeyValueStoreBase : public KeyValueStore,
4747
absl::optional<std::chrono::seconds> ttl_;
4848
};
4949

50-
using KeyValueMap = quiche::QuicheLinkedHashMap<std::string, ValueWithTtl>;
50+
using KeyValueMap = absl::linked_hash_map<std::string, ValueWithTtl>;
5151

5252
const KeyValueMap& store() { return store_; }
5353

source/common/http/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ envoy_cc_library(
263263
"//source/common/common:key_value_store_lib",
264264
"//source/common/common:logger_lib",
265265
"//source/common/config:utility_lib",
266+
"@abseil-cpp//absl/container:linked_hash_map",
266267
"@envoy_api//envoy/config/common/key_value/v3:pkg_cc_proto",
267268
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
268269
"@quiche//:http2_core_alt_svc_wire_format_lib",

source/common/http/http_server_properties_cache_impl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ void HttpServerPropertiesCacheImpl::resetBrokenness() {
378378
}
379379

380380
void HttpServerPropertiesCacheImpl::resetStatus() {
381-
for (const std::pair<Origin, OriginData>& protocol : protocols_) {
381+
for (const std::pair<const Origin, OriginData>& protocol : protocols_) {
382382
if (protocol.second.h3_status_tracker) {
383383
protocol.second.h3_status_tracker->markHttp3Pending();
384384
}

source/common/http/http_server_properties_cache_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "source/common/common/logger.h"
1515
#include "source/common/http/http3_status_tracker_impl.h"
1616

17+
#include "absl/container/linked_hash_map.h"
1718
#include "absl/strings/string_view.h"
18-
#include "quiche/common/quiche_linked_hash_map.h"
1919

2020
namespace Envoy {
2121
namespace Http {
@@ -110,7 +110,7 @@ class HttpServerPropertiesCacheImpl : public HttpServerPropertiesCache,
110110
}
111111
};
112112

113-
using ProtocolsMap = quiche::QuicheLinkedHashMap<Origin, OriginData, OriginHash>;
113+
using ProtocolsMap = absl::linked_hash_map<Origin, OriginData, OriginHash>;
114114
// Map from origin to list of alternate protocols.
115115
ProtocolsMap protocols_;
116116

source/extensions/filters/network/generic_proxy/router/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ envoy_cc_library(
3131
"//source/extensions/filters/network/generic_proxy:tracing_lib",
3232
"//source/extensions/filters/network/generic_proxy/interface:codec_interface",
3333
"//source/extensions/filters/network/generic_proxy/interface:filter_interface",
34+
"@abseil-cpp//absl/container:linked_hash_map",
3435
"@envoy_api//envoy/extensions/filters/network/generic_proxy/router/v3:pkg_cc_proto",
35-
"@quiche//:quiche_common_lib",
3636
],
3737
)
3838

source/extensions/filters/network/generic_proxy/router/router.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "source/extensions/filters/network/generic_proxy/interface/stream.h"
1717
#include "source/extensions/filters/network/generic_proxy/router/upstream.h"
1818

19-
#include "quiche/common/quiche_linked_hash_map.h"
19+
#include "absl/container/linked_hash_map.h"
2020

2121
namespace Envoy {
2222
namespace Extensions {

source/extensions/filters/network/generic_proxy/router/upstream.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "source/common/buffer/buffer_impl.h"
99
#include "source/extensions/filters/network/generic_proxy/interface/codec.h"
1010

11-
#include "quiche/common/quiche_linked_hash_map.h"
11+
#include "absl/container/linked_hash_map.h"
1212

1313
namespace Envoy {
1414
namespace Extensions {
@@ -388,7 +388,7 @@ class BoundGenericUpstream : public BoundGenericUpstreamBase,
388388
// generic proxy will send requests to server in order. Finally, the upstream server of these
389389
// protocols will send responses in order. We also assume that the L7 filter chain of these
390390
// protocols will not change the processing order.
391-
using LinkedAbslHashMap = quiche::QuicheLinkedHashMap<uint64_t, UpstreamRequestCallbacks*>;
391+
using LinkedAbslHashMap = absl::linked_hash_map<uint64_t, UpstreamRequestCallbacks*>;
392392
LinkedAbslHashMap pending_requests_;
393393
bool saw_connection_close_event_ = false;
394394
};

0 commit comments

Comments
 (0)