[Comb] Migrate from the ordered_map in PDPI to GUtil.

Signed-off-by: Bibhuprasad Singh <bibhuprasad@google.com>

Author: kishanps

dvaas/BUILD.bazel

@@ -117,11 +117,11 @@ cc_test(
         ":dvaas_detective",
         ":dvaas_detective_cc_proto",
         ":test_vector_cc_proto",
-        "//p4_pdpi/internal:ordered_map",
         "//p4_pdpi/packetlib:packetlib_cc_proto",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",
+	"@com_google_gutil//gutil:ordered_map",
         "@com_google_gutil//gutil:proto",
         "@com_google_gutil//gutil:testing",
         "@com_google_gutil//gutil:status_matchers",

dvaas/dvaas_detective_test.cc

@@ -35,9 +35,9 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "gutil/proto.h"
+#include "gutil/ordered_map.h"
 #include "gutil/status_matchers.h"
 #include "gutil/testing.h"
-#include "p4_pdpi/internal/ordered_map.h"
 #include "p4_pdpi/packetlib/packetlib.pb.h"
 #include "yggdrasil_decision_forests/dataset/data_spec.pb.h"
 #include "yggdrasil_decision_forests/model/decision_tree/decision_tree.h"

p4_fuzzer/BUILD.bazel

@@ -31,7 +31,6 @@ cc_library(
         "//p4_pdpi:ir",
         "//p4_pdpi:ir_cc_proto",
         "//p4_pdpi:translation_options",
-        "//p4_pdpi/internal:ordered_map",
         "@com_github_p4lang_p4runtime//:p4info_cc_proto",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
         "@com_google_absl//absl/container:btree",
@@ -46,6 +45,7 @@ cc_library(
         "@com_google_absl//absl/types:span",
         "@com_google_protobuf//:protobuf",
         "@com_google_gutil//gutil:collections",
+	"@com_google_gutil//gutil:ordered_map",
         "@com_google_gutil//gutil:proto",
         "@com_google_gutil//gutil:status",
     ],
@@ -147,7 +147,6 @@ cc_library(
         "//p4_pdpi:ir_cc_proto",
         "//p4_pdpi:ir_properties",
         "//p4_pdpi:references",
-        "//p4_pdpi/internal:ordered_map",
         "//p4_pdpi/netaddr:ipv6_address",
         "//p4_pdpi/string_encodings:byte_string",
         "//p4_pdpi/utils:ir",
@@ -175,6 +174,7 @@ cc_library(
         "@com_google_absl//absl/types:span",
         "@com_google_protobuf//:protobuf",
         "@com_google_gutil//gutil:collections",
+	"@com_google_gutil//gutil:ordered_map",
         "@com_google_gutil//gutil:proto",
         "@com_google_gutil//gutil:status",
     ],
@@ -297,7 +297,6 @@ cc_library(
         ":switch_state",
         "//lib/p4rt:p4rt_port",
         "//p4_pdpi:ir_cc_proto",
-        "//p4_pdpi/internal:ordered_map",
         "//p4_pdpi/testing:test_p4info_cc",
         "//sai_p4/instantiations/google:sai_p4info_cc",
         "@com_github_p4lang_p4runtime//:p4info_cc_proto",
@@ -306,6 +305,7 @@ cc_library(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
+	"@com_google_gutil//gutil:ordered_map",
     ],
 )
 

p4_fuzzer/constraints.cc

@@ -26,6 +26,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/substitute.h"
 #include "gutil/collections.h"
+#include "gutil/ordered_map.h"
 #include "gutil/status.h"
 #include "p4/config/v1/p4info.pb.h"
 #include "p4/v1/p4runtime.pb.h"
@@ -40,7 +41,6 @@
 #include "p4_fuzzer/fuzz_util.h"
 #include "p4_fuzzer/fuzzer_config.h"
 #include "p4_fuzzer/switch_state.h"
-#include "p4_pdpi/internal/ordered_map.h"
 #include "p4_pdpi/ir.pb.h"
 #include "p4_pdpi/ir_properties.h"
 
@@ -199,7 +199,7 @@ absl::StatusOr<TableEntry> FuzzValidConstrainedTableEntry(
 
   // Fuzz all skipped keys normally.
   for (const auto& [name, match_field_def] :
-       Ordered(table.match_fields_by_name())) {
+       gutil::AsOrderedView(table.match_fields_by_name())) {
     ASSIGN_OR_RETURN(std::string fully_qualified_name,
                      GetFullyQualifiedMatchFieldName(table, match_field_def));
     if (IsDisabledForFuzzing(config, fully_qualified_name)) {

p4_fuzzer/fuzz_util.cc

@@ -40,6 +40,7 @@
 #include "google/protobuf/repeated_field.h"
 #include "google/protobuf/repeated_ptr_field.h"
 #include "gutil/collections.h"
+#include "gutil/ordered_map.h"
 #include "gutil/proto.h"
 #include "gutil/status.h"
 #include "lib/p4rt/p4rt_port.h"
@@ -53,7 +54,6 @@
 #include "p4_fuzzer/switch_state.h"
 #include "p4_pdpi/built_ins.h"
 #include "p4_pdpi/entity_keys.h"
-#include "p4_pdpi/internal/ordered_map.h"
 #include "p4_pdpi/ir.pb.h"
 #include "p4_pdpi/netaddr/ipv6_address.h"
 #include "p4_pdpi/references.h"
@@ -65,6 +65,7 @@ namespace p4_fuzzer {
 using ::absl::gntohll;
 
 using ::absl::Uniform;
+using ::gutil::AsOrderedView;
 using ::p4::v1::Action;
 using ::p4::v1::Entity;
 using ::p4::v1::FieldMatch;
@@ -566,7 +567,7 @@ std::vector<uint32_t> GetMandatoryMatchTableIds(const FuzzerConfig& config) {
   std::vector<uint32_t> table_ids;
 
   for (const IrTableDefinition& table : AllValidTablesForP4RtRole(config)) {
-    for (auto& [match_id, match] : Ordered(table.match_fields_by_id())) {
+    for (auto& [match_id, match] : AsOrderedView(table.match_fields_by_id())) {
       if (match.match_field().match_type() ==
           p4::config::v1::MatchField::EXACT) {
         table_ids.push_back(table.preamble().id());
@@ -582,7 +583,7 @@ std::vector<uint32_t> GetMandatoryMatchTableIds(const FuzzerConfig& config) {
 std::vector<uint32_t> GetDifferentRoleTableIds(const FuzzerConfig& config) {
   std::vector<uint32_t> table_ids;
 
-  for (auto& [key, table] : Ordered(config.GetIrP4Info().tables_by_id())) {
+  for (auto& [key, table] : AsOrderedView(config.GetIrP4Info().tables_by_id())) {
     if (table.role() == config.GetRole()) continue;
     table_ids.push_back(key);
   }
@@ -1016,7 +1017,7 @@ struct VariableWithReferences {
 absl::StatusOr<p4::config::v1::ActionProfile> GetActionProfile(
     const pdpi::IrP4Info& ir_info, int table_id) {
   for (const auto& [id, action_profile_definition] :
-       Ordered(ir_info.action_profiles_by_id())) {
+       AsOrderedView(ir_info.action_profiles_by_id())) {
     if (action_profile_definition.has_action_profile()) {
       // Does the action profile apply to the given table?
       auto& action_profile = action_profile_definition.action_profile();
@@ -1034,7 +1035,7 @@ const std::vector<IrTableDefinition> AllValidTablesForP4RtRole(
     const FuzzerConfig& config) {
   std::vector<IrTableDefinition> tables;
 
-  for (auto& [key, table] : Ordered(config.GetIrP4Info().tables_by_id())) {
+  for (auto& [key, table] : AsOrderedView(config.GetIrP4Info().tables_by_id())) {
     // Tables with the wrong role can't be modified by the controller.
     if (table.role() != config.GetRole()) continue;
     // Tables without actions cannot have valid table entries.
@@ -1070,7 +1071,7 @@ const std::vector<pdpi::IrMatchFieldDefinition> AllValidMatchFields(
   std::vector<pdpi::IrMatchFieldDefinition> match_fields;
 
   for (const auto& [_, match_field_info] :
-       Ordered(table.match_fields_by_id())) {
+       AsOrderedView(table.match_fields_by_id())) {
     // Skip deprecated, unused, and disallowed fields.
     const absl::StatusOr<std::string> fully_qualified_match_field =
         GetFullyQualifiedMatchFieldName(table, match_field_info);
@@ -1366,7 +1367,7 @@ absl::StatusOr<p4::v1::Action> FuzzAction(
   action.set_action_id(ir_action_info.preamble().id());
 
   for (auto& [param_name, ir_param] :
-       Ordered(ir_action_info.params_by_name())) {
+       AsOrderedView(ir_action_info.params_by_name())) {
     p4::v1::Action::Param* param = action.add_params();
     param->set_param_id(ir_param.param().id());
     ASSIGN_OR_RETURN(

p4_fuzzer/mutation.cc

@@ -13,18 +13,27 @@
 // limitations under the License.
 #include "p4_fuzzer/mutation.h"
 
+#include <cstdint>
+#include <string>
+#include <vector>
+
 #include "absl/algorithm/container.h"
+#include "absl/log/log.h"
+#include "absl/random/random.h"
 #include "absl/status/status.h"
 #include "gutil/collections.h"
+#include "gutil/ordered_map.h"
+#include "gutil/status.h"
 #include "p4/v1/p4runtime.pb.h"
 #include "p4_fuzzer/fuzz_util.h"
 #include "p4_fuzzer/fuzzer_config.h"
-#include "p4_pdpi/internal/ordered_map.h"
+#include "p4_fuzzer/switch_state.h"
 
 namespace p4_fuzzer {
 
 using ::absl::BitGen;
 using ::absl::Uniform;
+using ::gutil::AsOrderedView;
 using ::p4::v1::TableEntry;
 
 namespace {
@@ -45,7 +54,7 @@ const std::vector<uint32_t> AllTableIds(const FuzzerConfig& config) {
   std::vector<uint32_t> table_ids;
 
   for (auto& [table_id, table_def] :
-       Ordered(config.GetIrP4Info().tables_by_id())) {
+       AsOrderedView(config.GetIrP4Info().tables_by_id())) {
     table_ids.push_back(table_id);
   }
 
@@ -57,7 +66,7 @@ const std::vector<uint32_t> AllActionIds(const FuzzerConfig& config) {
   std::vector<uint32_t> action_ids;
 
   for (auto& [action_id, action_def] :
-       Ordered(config.GetIrP4Info().actions_by_id())) {
+       AsOrderedView(config.GetIrP4Info().actions_by_id())) {
     action_ids.push_back(action_id);
   }
 
@@ -71,7 +80,7 @@ const std::vector<uint32_t> AllMatchFieldIds(const FuzzerConfig& config,
   std::vector<uint32_t> match_ids;
 
   for (auto& [match_id, match_def] :
-       Ordered(gutil::FindOrDie(config.GetIrP4Info().tables_by_id(), table_id)
+       AsOrderedView(gutil::FindOrDie(config.GetIrP4Info().tables_by_id(), table_id)
                    .match_fields_by_id())) {
     match_ids.push_back(match_id);
   }

p4_fuzzer/switch_state.cc

@@ -34,13 +34,13 @@
 #include "absl/types/span.h"
 #include "google/protobuf/util/message_differencer.h"
 #include "gutil/collections.h"
+#include "gutil/ordered_map.h"
 #include "gutil/proto.h"
 #include "gutil/status.h"
 #include "p4/config/v1/p4info.pb.h"
 #include "p4/v1/p4runtime.pb.h"
 #include "p4_pdpi/built_ins.h"
 #include "p4_pdpi/entity_keys.h"
-#include "p4_pdpi/internal/ordered_map.h"
 #include "p4_pdpi/ir.h"
 #include "p4_pdpi/ir.pb.h"
 #include "p4_pdpi/translation_options.h"
@@ -926,7 +926,7 @@ std::string SwitchState::SwitchStateSummary() const {
   if (ordered_tables_.empty()) return std::string("EmptyState()");
   std::string res = "";
   // Ordered is used to get a deterministic order for the summary.
-  for (const auto& [table_id, table] : Ordered(ordered_tables_)) {
+  for (const auto& [table_id, table] : gutil::AsOrderedView(ordered_tables_)) {
     const pdpi::IrTableDefinition& table_definition =
         FindOrDie(ir_p4info_.tables_by_id(), table_id);
     const std::string& table_name = table_definition.preamble().alias();

p4_fuzzer/test_utils.cc

@@ -16,18 +16,22 @@
 #include <string>
 
 #include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/substitute.h"
+#include "gutil/ordered_map.h"
 #include "gutil/status.h"
 #include "lib/p4rt/p4rt_port.h"
 #include "p4/config/v1/p4info.pb.h"
 #include "p4/v1/p4runtime.pb.h"
 #include "p4_fuzzer/fuzzer_config.h"
 #include "p4_fuzzer/switch_state.h"
-#include "p4_pdpi/internal/ordered_map.h"
 #include "p4_pdpi/ir.pb.h"
 
 namespace p4_fuzzer {
+
+using ::gutil::AsOrderedView;
+
 absl::StatusOr<FuzzerTestState> ConstructFuzzerTestState(
     const p4::config::v1::P4Info& info, const std::string& role) {
   ASSIGN_OR_RETURN(
@@ -52,7 +56,7 @@ GetAMatchFieldDefinitionWithMatchType(
     const pdpi::IrTableDefinition& table_definition,
     p4::config::v1::MatchField::MatchType match_type) {
   for (const auto& [unused, match_field] :
-       Ordered(table_definition.match_fields_by_id())) {
+       AsOrderedView(table_definition.match_fields_by_id())) {
     if (match_field.match_field().match_type() == match_type) {
       return match_field;
     }
@@ -67,7 +71,7 @@ absl::StatusOr<pdpi::IrTableDefinition> GetATableDefinitionWithMatchType(
     const FuzzerTestState& fuzzer_state,
     p4::config::v1::MatchField::MatchType match_type) {
   for (const auto& [unused, table] :
-       Ordered(fuzzer_state.config.GetIrP4Info().tables_by_id())) {
+       AsOrderedView(fuzzer_state.config.GetIrP4Info().tables_by_id())) {
     if (GetAMatchFieldDefinitionWithMatchType(table, match_type).ok()) {
       return table;
     }
@@ -79,7 +83,7 @@ absl::StatusOr<pdpi::IrTableDefinition> GetATableDefinitionWithMatchType(
 
 absl::StatusOr<pdpi::IrTableDefinition> GetAOneShotTableDefinition(
     const pdpi::IrP4Info& info) {
-  for (const auto& [unused, table] : Ordered(info.tables_by_id())) {
+  for (const auto& [unused, table] : AsOrderedView(info.tables_by_id())) {
     if (table.uses_oneshot()) {
       return table;
     }

p4_pdpi/BUILD.bazel

@@ -96,7 +96,6 @@ cc_library(
     deps = [
         ":built_ins",
         ":ir_cc_proto",
-        "//p4_pdpi/internal:ordered_map",
         "//p4_pdpi/utils:annotation_parser",
         "@com_github_p4lang_p4runtime//:p4info_cc_proto",
         "@com_google_absl//absl/container:btree",
@@ -107,6 +106,7 @@ cc_library(
         "@com_google_absl//absl/strings:string_view",
         "@com_google_protobuf//:protobuf",
         "@com_google_gutil//gutil:collections",
+	"@com_google_gutil//gutil:ordered_map",
         "@com_google_gutil//gutil:status",
     ],
 )
@@ -205,7 +205,6 @@ cc_library(
         ":ir",
         ":ir_cc_proto",
         ":translation_options",
-        "//p4_pdpi/internal:ordered_map",
         "//p4_pdpi/string_encodings:hex_string",
         "//p4_pdpi/utils:ir",
         "@com_github_grpc_grpc//:grpc++",
@@ -221,6 +220,7 @@ cc_library(
         "@com_google_googleapis//google/rpc:status_cc_proto",
         "@com_google_protobuf//:protobuf",
         "@com_google_gutil//gutil:collections",
+	"@com_google_gutil//gutil:ordered_map",
         "@com_google_gutil//gutil:proto",
         "@com_google_gutil//gutil:status",
     ],
@@ -254,12 +254,12 @@ cc_library(
     deps = [
         ":ir_cc_proto",
         ":pd",
-        "//p4_pdpi/internal:ordered_map",
         "@com_github_p4lang_p4runtime//:p4info_cc_proto",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_gutil//gutil:collections",
+	"@com_google_gutil//gutil:ordered_map",
         "@com_google_gutil//gutil:status",
     ],
 )