Skip to content

Commit 97f8364

Browse files
Renamed IndexInfo.key to .name for consistency
1 parent 31e28d6 commit 97f8364

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Sources/CodableDatastore/Persistence/Disk Persistence/Datastore/DatastoreRoot.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ extension DiskPersistence.Datastore.RootObject {
116116
var indexes: [IndexName: DiskPersistence.Datastore.Index] = [:]
117117

118118
for indexInfo in try await rootObject.directIndexManifests {
119-
indexes[indexInfo.key] = await datastore.index(for: .direct(index: indexInfo.id, manifest: indexInfo.root))
119+
indexes[indexInfo.name] = await datastore.index(for: .direct(index: indexInfo.id, manifest: indexInfo.root))
120120
}
121121

122122
return indexes
@@ -128,7 +128,7 @@ extension DiskPersistence.Datastore.RootObject {
128128
var indexes: [IndexName: DiskPersistence.Datastore.Index] = [:]
129129

130130
for indexInfo in try await rootObject.secondaryIndexManifests {
131-
indexes[indexInfo.key] = await datastore.index(for: .secondary(index: indexInfo.id, manifest: indexInfo.root))
131+
indexes[indexInfo.name] = await datastore.index(for: .secondary(index: indexInfo.id, manifest: indexInfo.root))
132132
}
133133

134134
return indexes
@@ -171,7 +171,7 @@ extension DiskPersistence.Datastore.RootObject {
171171
version = originalVersion
172172
} else {
173173
let indexInfo = DatastoreRootManifest.IndexInfo(
174-
key: indexName,
174+
name: indexName,
175175
id: DatastoreIndexIdentifier(name: indexName),
176176
root: DatastoreIndexManifestIdentifier()
177177
)
@@ -205,7 +205,7 @@ extension DiskPersistence.Datastore.RootObject {
205205
version = originalVersion
206206
} else {
207207
let indexInfo = DatastoreRootManifest.IndexInfo(
208-
key: indexName,
208+
name: indexName,
209209
id: DatastoreIndexIdentifier(name: indexName),
210210
root: DatastoreIndexManifestIdentifier()
211211
)
@@ -324,14 +324,14 @@ extension DiskPersistence.Datastore.RootObject {
324324
case .direct(let indexID, let manifestID):
325325
removedIndex = .direct(index: indexID, manifest: manifestID)
326326
if let entryIndex = updatedManifest.directIndexManifests.firstIndex(where: { $0.id == indexID }) {
327-
let indexName = updatedManifest.directIndexManifests[entryIndex].key
327+
let indexName = updatedManifest.directIndexManifests[entryIndex].name
328328
updatedManifest.directIndexManifests.remove(at: entryIndex)
329329
updatedManifest.descriptor.directIndexes.removeValue(forKey: indexName)
330330
}
331331
case .secondary(let indexID, let manifestID):
332332
removedIndex = .secondary(index: indexID, manifest: manifestID)
333333
if let entryIndex = updatedManifest.secondaryIndexManifests.firstIndex(where: { $0.id == indexID }) {
334-
let indexName = updatedManifest.secondaryIndexManifests[entryIndex].key
334+
let indexName = updatedManifest.secondaryIndexManifests[entryIndex].name
335335
updatedManifest.secondaryIndexManifests.remove(at: entryIndex)
336336
updatedManifest.descriptor.secondaryIndexes.removeValue(forKey: indexName)
337337
}

Sources/CodableDatastore/Persistence/Disk Persistence/Datastore/DatastoreRootManifest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ struct DatastoreRootManifest: Codable, Equatable, Identifiable {
5353
extension DatastoreRootManifest {
5454
struct IndexInfo: Codable, Equatable, Identifiable {
5555
/// The key this index uses.
56-
var key: IndexName
56+
var name: IndexName
5757

5858
/// The identifier for the index on disk.
5959
var id: DatastoreIndexIdentifier

Sources/CodableDatastore/Persistence/Disk Persistence/Transaction/Transaction.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,15 +347,15 @@ extension DiskPersistence.Transaction: DatastoreInterfaceProtocol {
347347

348348
let directIndexManifests = descriptor.directIndexes.map { (_, index) in
349349
DatastoreRootManifest.IndexInfo(
350-
key: index.name,
350+
name: index.name,
351351
id: DatastoreIndexIdentifier(name: index.name),
352352
root: DatastoreIndexManifestIdentifier()
353353
)
354354
}
355355

356356
let secondaryIndexManifests = descriptor.secondaryIndexes.map { (_, index) in
357357
DatastoreRootManifest.IndexInfo(
358-
key: index.name,
358+
name: index.name,
359359
id: DatastoreIndexIdentifier(name: index.name),
360360
root: DatastoreIndexManifestIdentifier()
361361
)

0 commit comments

Comments
 (0)