starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-18 07:24:09 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into corestore2_develop

Browse Source 
# Conflicts:
#	Cartfile
#	Cartfile.resolved
#	CoreStore.podspec
#	CoreStore.xcodeproj/project.pbxproj
#	CoreStore/Migrating/DataStack+Migration.swift
#	CoreStore/Setting Up/DataStack.swift
#	README.md
#	Sources/Info.plist
This commit is contained in:
John Estropia
2016-03-24 15:09:36 +09:00
parent dd6c6abaf0 9f1a351311
commit 36e6e4a8b9
14 changed files with 531 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/Setting Up/DataStack.swift
View File

@@ -151,7 +151,7 @@ public final class DataStack {
do {
return try self.coordinator.performBlockAndWait { () -> T in
return try self.coordinator.performSynchronously {
if let _ = self.persistentStoreForStorage(storage) {
@@ -202,7 +202,7 @@ public final class DataStack {
*/
public func addStorageAndWait<T: LocalStorage>(storage: T) throws -> T {
return try self.coordinator.performBlockAndWait {
return try self.coordinator.performSynchronously {
let fileURL = storage.fileURL
CoreStore.assert(
@@ -299,8 +299,18 @@ public final class DataStack {
let migrationQueue = NSOperationQueue()
migrationQueue.maxConcurrentOperationCount = 1
migrationQueue.name = "com.coreStore.migrationOperationQueue"
migrationQueue.qualityOfService = .Utility
migrationQueue.underlyingQueue = dispatch_queue_create("com.coreStore.migrationQueue", DISPATCH_QUEUE_SERIAL)
#if USE_FRAMEWORKS
migrationQueue.qualityOfService = .Utility
migrationQueue.underlyingQueue = dispatch_queue_create("com.coreStore.migrationQueue", DISPATCH_QUEUE_SERIAL)
#else
if #available(iOS 8.0, *) {
migrationQueue.qualityOfService = .Utility
migrationQueue.underlyingQueue = dispatch_queue_create("com.coreStore.migrationQueue", DISPATCH_QUEUE_SERIAL)
}
#endif
return migrationQueue
}()