cleanup

Author: stephencelis

Sources/SQLiteData/StructuredQueries+GRDB/CustomFunctions.swift

@@ -20,17 +20,12 @@ extension Database {
       Unmanaged.passRetained(ScalarDatabaseFunctionDefinition(function)).toOpaque(),
       { context, argumentCount, arguments in
         do {
-          let function = Unmanaged<ScalarDatabaseFunctionDefinition>
+          let definition = Unmanaged<ScalarDatabaseFunctionDefinition>
             .fromOpaque(sqlite3_user_data(context))
             .takeUnretainedValue()
-            .function
-          var decoder = SQLiteFunctionDecoder(
-            name: function.name,
-            argumentCount: argumentCount,
-            arguments: arguments
-          )
-          try function
-            .invoke(&decoder)
+          definition.decoder.reset(argumentCount: argumentCount, arguments: arguments)
+          try definition.function
+            .invoke(&definition.decoder)
             .result(db: context)
         } catch {
           QueryBinding.invalid(error).result(db: context)
@@ -59,13 +54,9 @@ extension Database {
       nil,
       { context, argumentCount, arguments in
         let function = AggregateDatabaseFunctionContext[context].takeUnretainedValue()
-        var decoder = SQLiteFunctionDecoder(
-          name: function.iterator.body.name,
-          argumentCount: argumentCount,
-          arguments: arguments
-        )
+        function.decoder.reset(argumentCount: argumentCount, arguments: arguments)
         do {
-          try function.iterator.step(&decoder)
+          try function.iterator.step(&function.decoder)
         } catch {
           sqlite3_result_error(context, error.localizedDescription, -1)
         }
@@ -118,8 +109,10 @@ extension DatabaseFunction {
 
 private final class ScalarDatabaseFunctionDefinition {
   let function: any ScalarDatabaseFunction
+  var decoder: SQLiteFunctionDecoder
   init(_ function: some ScalarDatabaseFunction) {
     self.function = function
+    self.decoder = SQLiteFunctionDecoder(name: function.name)
   }
 }
 
@@ -152,8 +145,10 @@ private final class AggregateDatabaseFunctionContext {
     }
   }
   let iterator: any AggregateDatabaseFunctionIteratorProtocol
+  var decoder: SQLiteFunctionDecoder
   init(_ body: some AggregateDatabaseFunction) {
     self.iterator = AggregateDatabaseFunctionIterator(body)
+    self.decoder = SQLiteFunctionDecoder(name: body.name)
   }
 }
 

Sources/SQLiteData/StructuredQueries+GRDB/Decoding.swift

@@ -1,11 +1,5 @@
 import GRDBSQLite
 
-#if !StrictDecoding
-  import ConcurrencyExtras
-
-  let reportedTypeMismatches = LockIsolated<Set<String>>([])
-#endif
-
 @usableFromInline
 func storageClassName(_ type: Int32) -> String {
   switch type {

Sources/SQLiteData/StructuredQueries+GRDB/SQLiteFunctionDecoder.swift

@@ -3,7 +3,6 @@ public import GRDBSQLite
 public import StructuredQueriesCore
 
 #if !StrictDecoding
-  import ConcurrencyExtras
   import IssueReporting
 #endif
 
@@ -13,19 +12,29 @@ struct SQLiteFunctionDecoder: QueryDecoder {
   let name: String
 
   @usableFromInline
-  let argumentCount: Int32
+  var argumentCount: Int32 = 0
 
   @usableFromInline
-  let arguments: UnsafeMutablePointer<OpaquePointer?>?
+  var arguments: UnsafeMutablePointer<OpaquePointer?>?
 
   @usableFromInline
   var currentIndex: Int32 = 0
 
+  #if !StrictDecoding
+    @usableFromInline
+    var reportedTypeMismatches: Set<Int32> = []
+  #endif
+
   @usableFromInline
-  init(name: String, argumentCount: Int32, arguments: UnsafeMutablePointer<OpaquePointer?>?) {
+  init(name: String) {
     self.name = name
+  }
+
+  @usableFromInline
+  mutating func reset(argumentCount: Int32, arguments: UnsafeMutablePointer<OpaquePointer?>?) {
     self.argumentCount = argumentCount
     self.arguments = arguments
+    self.currentIndex = 0
   }
 
   @inlinable
@@ -141,12 +150,11 @@ struct SQLiteFunctionDecoder: QueryDecoder {
   }
 
   @usableFromInline
-  func reportTypeMismatch(_ columnType: Any.Type) throws(QueryDecodingError) {
+  mutating func reportTypeMismatch(_ columnType: Any.Type) throws(QueryDecodingError) {
     #if StrictDecoding
       throw QueryDecodingError.typeMismatch(columnType)
     #else
-      let key = "\(currentIndex)|\(name)"
-      guard reportedTypeMismatches.withValue({ $0.insert(key).inserted })
+      guard reportedTypeMismatches.insert(currentIndex).inserted
       else { return }
       let value = arguments?[Int(currentIndex)]
       reportIssue(

Sources/SQLiteData/StructuredQueries+GRDB/SQLiteQueryDecoder.swift

@@ -3,7 +3,6 @@ public import GRDBSQLite
 public import StructuredQueriesCore
 
 #if !StrictDecoding
-  import ConcurrencyExtras
   import IssueReporting
 #endif
 
@@ -15,6 +14,11 @@ struct SQLiteQueryDecoder: QueryDecoder {
   @usableFromInline
   var currentIndex: Int32 = 0
 
+  #if !StrictDecoding
+    @usableFromInline
+    var reportedTypeMismatches: Set<Int32> = []
+  #endif
+
   @usableFromInline
   init(statement: OpaquePointer) {
     self.statement = statement
@@ -125,24 +129,22 @@ struct SQLiteQueryDecoder: QueryDecoder {
   }
 
   @usableFromInline
-  func reportTypeMismatch(_ columnType: Any.Type) throws(QueryDecodingError) {
+  mutating func reportTypeMismatch(_ columnType: Any.Type) throws(QueryDecodingError) {
     #if StrictDecoding
       throw QueryDecodingError.typeMismatch(columnType)
     #else
-      let sql = sqlite3_sql(statement).map { String(cString: $0) } ?? ""
-      let key = "\(currentIndex)|\(sql)"
-      guard reportedTypeMismatches.withValue({ $0.insert(key).inserted })
+      guard reportedTypeMismatches.insert(currentIndex).inserted
       else { return }
       let columnName =
         sqlite3_column_name(statement, currentIndex)
         .map { " (\(String(cString: $0).debugDescription))" }
         ?? ""
       reportIssue(
         """
-        Expected column \(currentIndex)\(columnName ?? "") to decode \(columnType), but found \
+        Expected column \(currentIndex)\(columnName) to decode \(columnType), but found \
         \(storageClassName(sqlite3_column_type(statement, currentIndex))): ...
 
-        \(sql)
+        \(sqlite3_sql(statement).map { String(cString: $0) } ?? "")
         """
       )
     #endif