refactor: use IndexSet

Author: jacek-prisma

schema-engine/sql-schema-describer/Cargo.toml

@@ -30,7 +30,7 @@ either.workspace = true
 async-trait.workspace = true
 bigdecimal.workspace = true
 enumflags2 = { workspace = true, features = ["serde"] }
-indexmap.workspace = true
+indexmap = { workspace = true, features = ["serde"] }
 indoc.workspace = true
 itertools.workspace = true
 regex.workspace = true

schema-engine/sql-schema-describer/src/lib.rs

@@ -24,6 +24,7 @@ pub use self::{
     walkers::*,
 };
 pub use either::Either;
+use indexmap::IndexSet;
 pub use prisma_value::PrismaValue;
 
 use enumflags2::{BitFlag, BitFlags};
@@ -57,7 +58,7 @@ pub struct SqlMetadata {
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
 pub struct SqlSchema {
     /// Namespaces (schemas)
-    namespaces: Vec<String>,
+    namespaces: IndexSet<String>,
     /// The schema's tables.
     tables: Vec<Table>,
     /// The schema's enums.
@@ -185,10 +186,7 @@ impl SqlSchema {
 
     /// Find a namespace by name.
     pub fn get_namespace_id(&self, name: &str) -> Option<NamespaceId> {
-        self.namespaces
-            .binary_search_by(|ns_name| ns_name.as_str().cmp(name))
-            .ok()
-            .map(|pos| NamespaceId(pos as u32))
+        self.namespaces.get_index_of(name).map(|pos| NamespaceId(pos as u32))
     }
 
     /// The total number of indexes in the schema.
@@ -333,9 +331,8 @@ impl SqlSchema {
     }
 
     pub fn push_namespace(&mut self, name: String) -> NamespaceId {
-        let id = NamespaceId(self.namespaces.len() as u32);
-        self.namespaces.push(name);
-        id
+        let (id, _) = self.namespaces.insert_full(name);
+        NamespaceId(id as u32)
     }
 
     pub fn push_table(&mut self, name: String, namespace_id: NamespaceId, description: Option<String>) -> TableId {

schema-engine/sql-schema-describer/src/mssql.rs

@@ -9,7 +9,6 @@ use either::Either;
 use enumflags2::BitFlags;
 use indexmap::IndexMap;
 use indoc::indoc;
-use itertools::Itertools;
 use prisma_value::PrismaValue;
 use psl::{
     builtin_connectors::{MsSqlType, MsSqlTypeParameter},
@@ -547,11 +546,7 @@ impl<'a> SqlSchemaDescriber<'a> {
         let names = rows
             .into_iter()
             .map(|row| row.get_expect_string("name"))
-            .filter(|name| namespaces.contains(&name.as_str()))
-            // SqlSchema uses binary search, namespaces must be added in sorted order.
-            // We have to sort regardless of the ORDER BY since Rust ordering could
-            // be different then the one used by SQL Server.
-            .sorted();
+            .filter(|name| namespaces.contains(&name.as_str()));
 
         for name in names {
             sql_schema.push_namespace(name);

schema-engine/sql-schema-describer/src/walkers/enum.rs

@@ -15,7 +15,7 @@ impl<'a> EnumWalker<'a> {
     pub fn namespace(self) -> Option<&'a str> {
         self.schema
             .namespaces
-            .get(self.get().namespace_id.0 as usize)
+            .get_index(self.get().namespace_id.0 as usize)
             .map(|s| s.as_str())
     }
 

schema-engine/sql-schema-describer/src/walkers/table.rs

@@ -71,7 +71,7 @@ impl<'a> TableWalker<'a> {
     pub fn namespace(self) -> Option<&'a str> {
         self.schema
             .namespaces
-            .get(self.table().namespace_id.0 as usize)
+            .get_index(self.table().namespace_id.0 as usize)
             .map(|s| s.as_str())
     }
 

schema-engine/sql-schema-describer/src/walkers/user_defined_type.rs

@@ -18,7 +18,7 @@ impl<'a> UserDefinedTypeWalker<'a> {
     pub fn namespace(self) -> Option<&'a str> {
         self.schema
             .namespaces
-            .get(self.get().namespace_id.0 as usize)
+            .get_index(self.get().namespace_id.0 as usize)
             .map(|s| s.as_str())
     }
 

schema-engine/sql-schema-describer/src/walkers/view.rs

@@ -20,7 +20,7 @@ impl<'a> ViewWalker<'a> {
     pub fn namespace(self) -> Option<&'a str> {
         self.schema
             .namespaces
-            .get(self.get().namespace_id.0 as usize)
+            .get_index(self.get().namespace_id.0 as usize)
             .map(|s| s.as_str())
     }