From 0b24072259afdabb9157cd5c562482c44329ba2c Mon Sep 17 00:00:00 2001 From: John Rommel Estropia Date: Fri, 1 Apr 2016 01:22:16 +0900 Subject: [PATCH 1/4] Workaround CoreData's bug when using NSFetchRequest's affectedStores property --- .../CoreStoreFetchedResultsController.swift | 16 ++++++++++++++++ .../NSManagedObjectContext+Querying.swift | 16 ++++++++-------- CoreStore/Observing/ListMonitor.swift | 2 +- CoreStore/Observing/ObjectMonitor.swift | 2 +- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/CoreStore/Internal/CoreStoreFetchedResultsController.swift b/CoreStore/Internal/CoreStoreFetchedResultsController.swift index 1286713..cb6c7e2 100644 --- a/CoreStore/Internal/CoreStoreFetchedResultsController.swift +++ b/CoreStore/Internal/CoreStoreFetchedResultsController.swift @@ -104,3 +104,19 @@ internal final class CoreStoreFetchedResultsController: NSFe private let reapplyAffectedStores: (fetchRequest: NSFetchRequest, context: NSManagedObjectContext) -> Bool } + + +// MARK: - CoreStoreFetchRequest + +// Bugfix for NSFetchRequest messing up memory management for `affectedStores` +// http://stackoverflow.com/questions/14396375/nsfetchedresultscontroller-crashes-in-ios-6-if-affectedstores-is-specified +internal final class CoreStoreFetchRequest: NSFetchRequest { + + override var affectedStores: [NSPersistentStore]? { + + get { return self.safeAffectedStores } + set { self.safeAffectedStores = newValue } + } + + private var safeAffectedStores: [NSPersistentStore]? +} diff --git a/CoreStore/Internal/NSManagedObjectContext+Querying.swift b/CoreStore/Internal/NSManagedObjectContext+Querying.swift index 7beb916..5547940 100644 --- a/CoreStore/Internal/NSManagedObjectContext+Querying.swift +++ b/CoreStore/Internal/NSManagedObjectContext+Querying.swift @@ -76,7 +76,7 @@ internal extension NSManagedObjectContext { internal func fetchOne(from: From, _ fetchClauses: [FetchClause]) -> T? { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() from.applyToFetchRequest(fetchRequest, context: self) fetchRequest.fetchLimit = 1 @@ -119,7 +119,7 @@ internal extension NSManagedObjectContext { internal func fetchAll(from: From, _ fetchClauses: [FetchClause]) -> [T]? { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() from.applyToFetchRequest(fetchRequest, context: self) fetchRequest.fetchLimit = 0 @@ -162,7 +162,7 @@ internal extension NSManagedObjectContext { internal func fetchCount(from: From, _ fetchClauses: [FetchClause]) -> Int? { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() from.applyToFetchRequest(fetchRequest, context: self) for clause in fetchClauses { @@ -195,7 +195,7 @@ internal extension NSManagedObjectContext { internal func fetchObjectID(from: From, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() from.applyToFetchRequest(fetchRequest, context: self) fetchRequest.fetchLimit = 1 @@ -238,7 +238,7 @@ internal extension NSManagedObjectContext { internal func fetchObjectIDs(from: From, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() from.applyToFetchRequest(fetchRequest, context: self) fetchRequest.fetchLimit = 0 @@ -281,7 +281,7 @@ internal extension NSManagedObjectContext { internal func deleteAll(from: From, _ deleteClauses: [DeleteClause]) -> Int? { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() from.applyToFetchRequest(fetchRequest, context: self) fetchRequest.fetchLimit = 0 @@ -334,7 +334,7 @@ internal extension NSManagedObjectContext { internal func queryValue(from: From, _ selectClause: Select, _ queryClauses: [QueryClause]) -> U? { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() from.applyToFetchRequest(fetchRequest, context: self) fetchRequest.fetchLimit = 0 @@ -383,7 +383,7 @@ internal extension NSManagedObjectContext { internal func queryAttributes(from: From, _ selectClause: Select, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() from.applyToFetchRequest(fetchRequest, context: self) fetchRequest.fetchLimit = 0 diff --git a/CoreStore/Observing/ListMonitor.swift b/CoreStore/Observing/ListMonitor.swift index d0c5bf5..2c6b748 100644 --- a/CoreStore/Observing/ListMonitor.swift +++ b/CoreStore/Observing/ListMonitor.swift @@ -991,7 +991,7 @@ public final class ListMonitor { private init(context: NSManagedObjectContext, transactionQueue: GCDQueue, from: From, sectionBy: SectionBy?, fetchClauses: [FetchClause], createAsynchronously: ((ListMonitor) -> Void)?) { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() fetchRequest.fetchLimit = 0 fetchRequest.resultType = .ManagedObjectResultType fetchRequest.fetchBatchSize = 20 diff --git a/CoreStore/Observing/ObjectMonitor.swift b/CoreStore/Observing/ObjectMonitor.swift index c3f16b8..81e3717 100644 --- a/CoreStore/Observing/ObjectMonitor.swift +++ b/CoreStore/Observing/ObjectMonitor.swift @@ -175,7 +175,7 @@ public final class ObjectMonitor { private init(context: NSManagedObjectContext, object: T) { - let fetchRequest = NSFetchRequest() + let fetchRequest = CoreStoreFetchRequest() fetchRequest.entity = object.entity fetchRequest.fetchLimit = 0 fetchRequest.resultType = .ManagedObjectResultType From 44cfbebedb7def15bc599cfbd5e1e5238e97a9c2 Mon Sep 17 00:00:00 2001 From: John Rommel Estropia Date: Fri, 1 Apr 2016 01:28:39 +0900 Subject: [PATCH 2/4] prevent deadlock on when DataStack gets deallocated --- CoreStore/Setting Up/DataStack.swift | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CoreStore/Setting Up/DataStack.swift b/CoreStore/Setting Up/DataStack.swift index 551ba4e..0b1ba57 100644 --- a/CoreStore/Setting Up/DataStack.swift +++ b/CoreStore/Setting Up/DataStack.swift @@ -399,9 +399,16 @@ public final class DataStack { deinit { - for store in self.coordinator.persistentStores { + let coordinator = self.coordinator + coordinator.performAsynchronously { - _ = try? self.coordinator.removePersistentStore(store) + withExtendedLifetime(coordinator) { coordinator in + + coordinator.persistentStores.forEach { + + _ = try? coordinator.removePersistentStore($0) + } + } } } } From 784a315fb9990545ead91d9030904d02a60c5f54 Mon Sep 17 00:00:00 2001 From: John Rommel Estropia Date: Fri, 1 Apr 2016 01:32:32 +0900 Subject: [PATCH 3/4] version bump --- CoreStore.podspec | 2 +- CoreStore/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CoreStore.podspec b/CoreStore.podspec index 4d76ebe..287cfb4 100644 --- a/CoreStore.podspec +++ b/CoreStore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "CoreStore" - s.version = "1.6.1" + s.version = "1.6.2" s.license = "MIT" s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift" s.homepage = "https://github.com/JohnEstropia/CoreStore" diff --git a/CoreStore/Info.plist b/CoreStore/Info.plist index 148a1d1..f802798 100644 --- a/CoreStore/Info.plist +++ b/CoreStore/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.6.1 + 1.6.2 CFBundleSignature ???? CFBundleVersion From 0c564add469caa941b2996ce2aba57cfb39edb9b Mon Sep 17 00:00:00 2001 From: John Rommel Estropia Date: Fri, 1 Apr 2016 07:04:02 +0900 Subject: [PATCH 4/4] separate CoreStoreFetchRequest file --- CoreStore.xcodeproj/project.pbxproj | 12 ++++++ .../Internal/CoreStoreFetchRequest.swift | 43 +++++++++++++++++++ .../CoreStoreFetchedResultsController.swift | 16 ------- 3 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 CoreStore/Internal/CoreStoreFetchRequest.swift diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 125ae7a..10d86b3 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -87,6 +87,11 @@ B51BE06A1B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */; }; B5202CFA1C04688100DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; }; B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; }; + B52661401CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; }; + B52661411CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; }; + B52661421CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; }; + B52661431CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; }; + B52661441CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */; }; B52DD17E1BE1F8CD00949AFE /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52DD1741BE1F8CC00949AFE /* CoreStore.framework */; }; B52DD1911BE1F8EB00949AFE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5548CD51BD65AE00077652A /* Foundation.framework */; }; B52DD1921BE1F8F000949AFE /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5548CD71BD65AE50077652A /* CoreData.framework */; }; @@ -378,6 +383,7 @@ B519E4571C4CD2CA00E7B469 /* GCDKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GCDKit.framework; path = "../../Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = ""; }; B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectModel+Setup.swift"; sourceTree = ""; }; B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFetchedResultsController+Convenience.swift"; sourceTree = ""; }; + B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreStoreFetchRequest.swift; sourceTree = ""; }; B52DD1741BE1F8CC00949AFE /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B52DD17D1BE1F8CC00949AFE /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchedResultsControllerDelegate.swift; sourceTree = ""; }; @@ -766,6 +772,7 @@ B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */, B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */, B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */, + B526613F1CADD585007B85D9 /* CoreStoreFetchRequest.swift */, B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */, B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */, B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */, @@ -1110,6 +1117,7 @@ B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */, B5E84F111AFF847B0064E85B /* Select.swift in Sources */, B50392F91C478FF3009900CA /* NSManagedObject+Transaction.swift in Sources */, + B52661401CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */, B5202CFA1C04688100DED140 /* NSFetchedResultsController+Convenience.swift in Sources */, B5E84EE11AFF84500064E85B /* PersistentStoreResult.swift in Sources */, B5E84F251AFF84860064E85B /* ObjectObserver.swift in Sources */, @@ -1188,6 +1196,7 @@ 82BA18DD1C4BBE1400A0916E /* NSFetchedResultsController+Convenience.swift in Sources */, 82BA18B41C4BBD3900A0916E /* BaseDataTransaction+Importing.swift in Sources */, 82BA18CA1C4BBD5900A0916E /* MigrationResult.swift in Sources */, + B52661421CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */, 82BA18C11C4BBD5300A0916E /* CoreStore+Observing.swift in Sources */, 82BA18BC1C4BBD4A00A0916E /* OrderBy.swift in Sources */, 82BA18B01C4BBD3100A0916E /* NSManagedObject+Transaction.swift in Sources */, @@ -1266,6 +1275,7 @@ B52DD1C71BE1F94600949AFE /* NSManagedObjectContext+Querying.swift in Sources */, B52DD1C81BE1F94600949AFE /* NSManagedObjectContext+Setup.swift in Sources */, B52DD1C31BE1F94600949AFE /* NotificationObserver.swift in Sources */, + B52661441CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */, B52DD1A81BE1F93200949AFE /* DataStack+Querying.swift in Sources */, B52DD1BC1BE1F94000949AFE /* MigrationResult.swift in Sources */, B52DD19D1BE1F92C00949AFE /* BaseDataTransaction.swift in Sources */, @@ -1333,6 +1343,7 @@ B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */, B56321AF1BD6521C006C9394 /* NSFileManager+Setup.swift in Sources */, B50392FA1C47963F009900CA /* NSManagedObject+Transaction.swift in Sources */, + B52661431CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */, B56321971BD65216006C9394 /* Select.swift in Sources */, B56321AB1BD6521C006C9394 /* FetchedResultsControllerDelegate.swift in Sources */, B56321821BD65216006C9394 /* PersistentStoreResult.swift in Sources */, @@ -1392,6 +1403,7 @@ B5D9E2F71CA2C317007A9D52 /* DataStack+Querying.swift in Sources */, B5D9E2F81CA2C317007A9D52 /* SectionBy.swift in Sources */, B5D9E2F91CA2C317007A9D52 /* NSManagedObjectContext+Transaction.swift in Sources */, + B52661411CADD585007B85D9 /* CoreStoreFetchRequest.swift in Sources */, B5D9E2FA1CA2C317007A9D52 /* UnsafeDataTransaction+Observing.swift in Sources */, B5D9E2FB1CA2C317007A9D52 /* MigrationChain.swift in Sources */, B5D9E2FC1CA2C317007A9D52 /* Tweak.swift in Sources */, diff --git a/CoreStore/Internal/CoreStoreFetchRequest.swift b/CoreStore/Internal/CoreStoreFetchRequest.swift new file mode 100644 index 0000000..e3bce41 --- /dev/null +++ b/CoreStore/Internal/CoreStoreFetchRequest.swift @@ -0,0 +1,43 @@ +// +// CoreStoreFetchRequest.swift +// CoreStore +// +// Copyright © 2016 John Rommel Estropia +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +import Foundation +import CoreData + + +// MARK: - CoreStoreFetchRequest + +// Bugfix for NSFetchRequest messing up memory management for `affectedStores` +// http://stackoverflow.com/questions/14396375/nsfetchedresultscontroller-crashes-in-ios-6-if-affectedstores-is-specified +internal final class CoreStoreFetchRequest: NSFetchRequest { + + override var affectedStores: [NSPersistentStore]? { + + get { return self.safeAffectedStores } + set { self.safeAffectedStores = newValue } + } + + private var safeAffectedStores: [NSPersistentStore]? +} diff --git a/CoreStore/Internal/CoreStoreFetchedResultsController.swift b/CoreStore/Internal/CoreStoreFetchedResultsController.swift index cb6c7e2..1286713 100644 --- a/CoreStore/Internal/CoreStoreFetchedResultsController.swift +++ b/CoreStore/Internal/CoreStoreFetchedResultsController.swift @@ -104,19 +104,3 @@ internal final class CoreStoreFetchedResultsController: NSFe private let reapplyAffectedStores: (fetchRequest: NSFetchRequest, context: NSManagedObjectContext) -> Bool } - - -// MARK: - CoreStoreFetchRequest - -// Bugfix for NSFetchRequest messing up memory management for `affectedStores` -// http://stackoverflow.com/questions/14396375/nsfetchedresultscontroller-crashes-in-ios-6-if-affectedstores-is-specified -internal final class CoreStoreFetchRequest: NSFetchRequest { - - override var affectedStores: [NSPersistentStore]? { - - get { return self.safeAffectedStores } - set { self.safeAffectedStores = newValue } - } - - private var safeAffectedStores: [NSPersistentStore]? -}