fix: query findAll() throwing hang risk warning (#14)

netreconlab · Nov 7, 2022 · 57de231 · 57de231
1 parent 4a52629
commit 57de231
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,15 @@
 # Parse-Swift Changelog
 
 ### main
-[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/4.16.0...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift)
+[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/4.16.1...main), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/main/documentation/parseswift)
 * _Contributing to this repo? Add info about your change here to be included in the next release_
 
+### 4.16.0
+[Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/4.16.0...4.16.1), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/4.16.1/documentation/parseswift)
+
+__Fixes__
+- Querying using findAll throws a hang risk warning in Xcode 14 ([#14](https://github.com/netreconlab/Parse-Swift/pull/10)), thanks to [Corey Baker](https://github.com/cbaker6).
+
 ### 4.16.0
 [Full Changelog](https://github.com/netreconlab/Parse-Swift/compare/4.15.2...4.16.0), [Documentation](https://swiftpackageindex.com/netreconlab/Parse-Swift/4.16.0/documentation/parseswift)
 

diff --git a/Sources/ParseSwift/ParseConstants.swift b/Sources/ParseSwift/ParseConstants.swift
@@ -10,7 +10,7 @@ import Foundation
 
 enum ParseConstants {
     static let sdk = "swift"
-    static let version = "4.16.0"
+    static let version = "4.16.1"
     static let fileManagementDirectory = "parse/"
     static let fileManagementPrivateDocumentsDirectory = "Private Documents/"
     static let fileManagementLibraryDirectory = "Library/"

diff --git a/Sources/ParseSwift/Types/Query.swift b/Sources/ParseSwift/Types/Query.swift
@@ -642,20 +642,55 @@ extension Query: Queryable {
             completion(.failure(error))
             return
         }
+
+        #if compiler(>=5.5.2) && canImport(_Concurrency)
+        Task {
+            var query = self
+                .order([.ascending("objectId")])
+            query.limit = limit ?? ParseConstants.batchLimit
+            var results = [ResultType]()
+            var finished = false
+            while !finished {
+                do {
+                    let currentResults = try await query.findCommand().executeAsync(options: options,
+                                                                                    callbackQueue: callbackQueue)
+                    results.append(contentsOf: currentResults)
+                    if currentResults.count >= query.limit {
+                        guard let lastObjectId = results[results.count - 1].objectId else {
+                            throw ParseError(code: .unknownError, message: "Last object should have an id.")
+                        }
+                        query.where.add("objectId" > lastObjectId)
+                    } else {
+                        finished = true
+                    }
+                } catch {
+                    let defaultError = ParseError(code: .unknownError,
+                                                  message: error.localizedDescription)
+                    let parseError = error as? ParseError ?? defaultError
+                    callbackQueue.async {
+                        completion(.failure(parseError))
+                    }
+                    return
+                }
+            }
+            let finalResults = results
+            callbackQueue.async {
+                completion(.success(finalResults))
+            }
+        }
+        #else
+        var query = self
+            .order([.ascending("objectId")])
+        query.limit = limit ?? ParseConstants.batchLimit
+        var results = [ResultType]()
+        var finished = false
         let uuid = UUID()
         let queue = DispatchQueue(label: "com.parse.findAll.\(uuid)",
                                   qos: .default,
                                   attributes: .concurrent,
                                   autoreleaseFrequency: .inherit,
                                   target: nil)
         queue.sync {
-
-            var query = self
-                .order([.ascending("objectId")])
-            query.limit = limit ?? ParseConstants.batchLimit
-            var results = [ResultType]()
-            var finished = false
-
             while !finished {
                 do {
                     let currentResults = try query.findCommand().execute(options: options)
@@ -683,6 +718,7 @@ extension Query: Queryable {
                 completion(.success(results))
             }
         }
+        #endif
     }
 
     /**