Revert "Package collections: improve search performance"

Sources/Basics/ConcurrencyHelpers.swift

@@ -126,7 +126,7 @@ public final class ThreadSafeArrayStore<Value> {
     }
 }
 
-/// Thread-safe value boxing structure
+/// Thread-safe value boxing  structure
 public final class ThreadSafeBox<Value> {
     private var underlying: Value?
     private let lock = Lock()

Sources/PackageCollections/CMakeLists.txt

@@ -23,7 +23,6 @@ add_library(PackageCollections
   Storage/PackageCollectionsSourcesStorage.swift
   Storage/PackageCollectionsStorage.swift
   Storage/SQLitePackageCollectionsStorage.swift
-  Storage/Trie.swift
   API.swift
   PackageCollections.swift
   PackageCollections+Configuration.swift

Sources/PackageCollections/Model/TargetListResult.swift

@@ -48,15 +48,11 @@ extension PackageCollectionsModel.TargetListResult {
 
 extension PackageCollectionsModel.TargetListResult {
     /// Represents a package version
-    public struct PackageVersion: Hashable, Encodable, Comparable {
+    public struct PackageVersion: Hashable, Encodable {
         /// The version
         public let version: TSCUtility.Version
 
         /// Package name
         public let packageName: String
-
-        public static func < (lhs: PackageVersion, rhs: PackageVersion) -> Bool {
-            lhs.version < rhs.version
-        }
     }
 }

Sources/PackageCollections/Storage/PackageCollectionsStorage.swift

@@ -53,7 +53,7 @@ public protocol PackageCollectionsStorage {
                         query: String,
                         callback: @escaping (Result<PackageCollectionsModel.PackageSearchResult, Error>) -> Void)
 
-    /// Returns `PackageSearchResult.Item` for the given package identity.
+    /// Returns optional `PackageSearchResult.Item` for the given package identity.
     ///
     /// - Parameters:
     ///   - identifier: The package identifier

Tests/PackageCollectionsTests/PackageCollectionsStorageTests.swift

@@ -196,37 +196,4 @@ class PackageCollectionsStorageTests: XCTestCase {
         _ = try tsc_await { callback in storage.put(collection: mockCollections.last!, callback: callback) }
         XCTAssertEqual(list.count, mockCollections.count)
     }
-
-    func testPopulateTargetTrie() throws {
-        try testWithTemporaryDirectory { tmpPath in
-            let path = tmpPath.appending(component: "test.db")
-            let storage = SQLitePackageCollectionsStorage(path: path)
-            defer { XCTAssertNoThrow(try storage.close()) }
-
-            let mockCollections = makeMockCollections(count: 3)
-            try mockCollections.forEach { collection in
-                _ = try tsc_await { callback in storage.put(collection: collection, callback: callback) }
-            }
-
-            let targetName = mockCollections.last!.packages.last!.versions.last!.targets.last!.name
-
-            do {
-                let searchResult = try tsc_await { callback in storage.searchTargets(query: targetName, type: .exactMatch, callback: callback) }
-                XCTAssert(searchResult.items.count > 0, "should get results")
-            }
-
-            // Create another instance, which should read existing data and populate target trie with it.
-            // Since we are not calling `storage2.put`, there is no other way for target trie to get populated.
-            let storage2 = SQLitePackageCollectionsStorage(path: path)
-            defer { XCTAssertNoThrow(try storage2.close()) }
-
-            // populateTargetTrie is called in `.init`; call it again explicitly so we know when it's finished
-            try tsc_await { callback in storage2.populateTargetTrie(callback: callback) }
-
-            do {
-                let searchResult = try tsc_await { callback in storage2.searchTargets(query: targetName, type: .exactMatch, callback: callback) }
-                XCTAssert(searchResult.items.count > 0, "should get results")
-            }
-        }
-    }
 }