Remove legacy finalizers

Author: simolus3

sqlite3/lib/src/implementation/database.dart

@@ -13,62 +13,20 @@ import '../result_set.dart';
 import '../statement.dart';
 import 'bindings.dart';
 import 'exception.dart';
-import 'finalizer.dart';
 import 'statement.dart';
 import 'utils.dart';
 
-/// Contains the state of a database needed for finalization.
-///
-/// This is extracted into separate object so that it can be used as a
-/// finalization token. It will get disposed when the main database is no longer
-/// reachable without being closed.
-final class FinalizableDatabase extends FinalizablePart {
-  final RawSqliteBindings bindings;
-  final RawSqliteDatabase database;
-
-  final List<FinalizableStatement> _statements = [];
-  final List<void Function()> dartCleanup = [];
-
-  FinalizableDatabase(this.bindings, this.database);
-
-  @override
-  void dispose() {
-    for (final stmt in _statements) {
-      stmt.dispose();
-    }
-
-    for (final cleanup in dartCleanup.toList()) {
-      cleanup();
-    }
-
-    final code = database.sqlite3_close_v2();
-    SqliteException? exception;
-    if (code != SqlError.SQLITE_OK) {
-      exception = createExceptionRaw(
-        bindings,
-        database,
-        code,
-        operation: 'closing database',
-      );
-    }
-
-    if (exception != null) {
-      throw exception;
-    }
-  }
-}
-
 base class DatabaseImplementation implements CommonDatabase {
   final RawSqliteBindings bindings;
+  // Note: Implementations of this have platform-specific finalizers on them.
   final RawSqliteDatabase database;
 
-  final FinalizableDatabase finalizable;
-
   _StreamHandlers<SqliteUpdate, void Function()>? _updates;
   _StreamHandlers<void, void Function()>? _rollbacks;
   _StreamHandlers<void, VoidPredicate>? _commits;
 
-  var _isClosed = false;
+  @internal
+  var isClosed = false;
 
   @override
   DatabaseConfig get config => DatabaseConfigImplementation(this);
@@ -91,24 +49,15 @@ base class DatabaseImplementation implements CommonDatabase {
     execute('PRAGMA user_version = $value;');
   }
 
-  DatabaseImplementation(this.bindings, this.database)
-    : finalizable = FinalizableDatabase(bindings, database) {
-    disposeFinalizer.attach(this, finalizable, detach: this);
-  }
+  DatabaseImplementation(this.bindings, this.database);
 
   @visibleForOverriding
   StatementImplementation wrapStatement(String sql, RawSqliteStatement stmt) {
     return StatementImplementation(sql, this, stmt);
   }
 
-  void handleFinalized(StatementImplementation stmt) {
-    if (!_isClosed) {
-      finalizable._statements.remove(stmt.finalizable);
-    }
-  }
-
   void _ensureOpen() {
-    if (_isClosed) {
+    if (isClosed) {
       throw StateError('This database has already been closed');
     }
   }
@@ -289,10 +238,9 @@ base class DatabaseImplementation implements CommonDatabase {
 
   @override
   void dispose() {
-    if (_isClosed) return;
+    if (isClosed) return;
 
-    disposeFinalizer.detach(this);
-    _isClosed = true;
+    isClosed = true;
 
     _updates?.close();
     _commits?.close();
@@ -302,7 +250,20 @@ base class DatabaseImplementation implements CommonDatabase {
     database.sqlite3_commit_hook(null);
     database.sqlite3_rollback_hook(null);
 
-    finalizable.dispose();
+    final code = database.sqlite3_close_v2();
+    SqliteException? exception;
+    if (code != SqlError.SQLITE_OK) {
+      exception = createExceptionRaw(
+        bindings,
+        database,
+        code,
+        operation: 'closing database',
+      );
+    }
+
+    if (exception != null) {
+      throw exception;
+    }
   }
 
   @override
@@ -447,11 +408,6 @@ base class DatabaseImplementation implements CommonDatabase {
     }
 
     compiler.close();
-
-    for (final created in createdStatements) {
-      finalizable._statements.add(created.finalizable);
-    }
-
     return createdStatements;
   }
 
@@ -661,7 +617,7 @@ final class _StreamHandlers<T, SyncCallback> {
 
   Stream<T> _generateStream(bool dispatchSynchronously) {
     return Stream.multi((newListener) {
-      if (_database._isClosed) {
+      if (_database.isClosed) {
         newListener.close();
         return;
       }
@@ -713,7 +669,7 @@ final class _StreamHandlers<T, SyncCallback> {
   void _removeAsyncListener(MultiStreamController<T> listener, bool sync) {
     _asyncListeners.remove((controller: listener, sync: sync));
 
-    if (!hasListener && !_database._isClosed) {
+    if (!hasListener && !_database.isClosed) {
       _unregister();
     }
   }

sqlite3/lib/src/implementation/finalizer.dart

@@ -10,22 +10,20 @@ import 'utils.dart';
 
 final class SessionImplementation implements Session {
   final RawSqliteBindings bindings;
+  // Note: Implementations of this have platform-specific finalizers on them.
   final RawSqliteSession session;
-  final FinalizableDatabase database;
 
   bool _deleted = false;
 
-  SessionImplementation(this.bindings, this.session, this.database) {
-    database.dartCleanup.add(delete);
-  }
+  SessionImplementation(this.bindings, this.session);
 
   static SessionImplementation createSession(
     DatabaseImplementation db,
     String name,
   ) {
     final bindings = db.bindings;
     final result = bindings.sqlite3session_create(db.database, name);
-    return SessionImplementation(bindings, result, db.finalizable);
+    return SessionImplementation(bindings, result);
   }
 
   void _checkNotDeleted() {
@@ -53,7 +51,6 @@ final class SessionImplementation implements Session {
     if (!_deleted) {
       _deleted = true;
       session.sqlite3session_delete();
-      database.dartCleanup.remove(delete);
     }
   }
 

sqlite3/lib/src/implementation/session.dart

@@ -4,47 +4,22 @@ import '../statement.dart';
 import 'bindings.dart';
 import 'database.dart';
 import 'exception.dart';
-import 'finalizer.dart';
 import 'utils.dart';
 
-final class FinalizableStatement extends FinalizablePart {
-  final RawSqliteStatement statement;
-
-  bool _inResetState = true;
-  bool _closed = false;
-
-  FinalizableStatement(this.statement);
-
-  @override
-  void dispose() {
-    if (!_closed) {
-      _closed = true;
-      _reset();
-      statement.sqlite3_finalize();
-    }
-  }
-
-  void _reset() {
-    if (!_inResetState) {
-      statement.sqlite3_reset();
-      _inResetState = true;
-    }
-  }
-}
-
 base class StatementImplementation extends CommonPreparedStatement {
+  // Note: Implementations of this have platform-specific finalizers on them.
   final RawSqliteStatement statement;
   final DatabaseImplementation database;
-  final FinalizableStatement finalizable;
 
   @override
   final String sql;
   List<Object?>? _latestArguments;
+  bool _inResetState = true;
+  bool _closed = false;
 
   _ActiveCursorIterator? _currentCursor;
 
-  StatementImplementation(this.sql, this.database, this.statement)
-    : finalizable = FinalizableStatement(statement);
+  StatementImplementation(this.sql, this.database, this.statement);
 
   List<String> get _columnNames {
     final columnCount = statement.sqlite3_column_count();
@@ -64,7 +39,7 @@ base class StatementImplementation extends CommonPreparedStatement {
   }
 
   void _ensureNotFinalized() {
-    if (finalizable._closed) {
+    if (_closed || database.isClosed) {
       throw StateError('Tried to operate on a released prepared statement');
     }
   }
@@ -87,7 +62,7 @@ base class StatementImplementation extends CommonPreparedStatement {
   void _execute() {
     int result;
 
-    finalizable._inResetState = false;
+    _inResetState = false;
     // Users should be able to execute statements returning rows, so we should
     // call _step() to skip past rows.
     do {
@@ -107,7 +82,7 @@ base class StatementImplementation extends CommonPreparedStatement {
 
   ResultSet _selectResults() {
     final rows = <List<Object?>>[];
-    finalizable._inResetState = false;
+    _inResetState = false;
 
     int columnCount = -1;
 
@@ -275,17 +250,20 @@ base class StatementImplementation extends CommonPreparedStatement {
 
   @override
   void reset() {
-    finalizable._reset();
+    if (!_inResetState) {
+      statement.sqlite3_reset();
+      _inResetState = true;
+    }
+
     _currentCursor = null;
   }
 
   @override
   void dispose() {
-    if (!finalizable._closed) {
-      disposeFinalizer.detach(this);
-      finalizable.dispose();
-
-      database.handleFinalized(this);
+    if (!_closed) {
+      _closed = true;
+      reset();
+      statement.sqlite3_finalize();
     }
   }
 
@@ -356,12 +334,12 @@ class _ActiveCursorIterator extends IteratingCursor {
 
   _ActiveCursorIterator(this.statement)
     : super(statement._columnNames, statement._tableNames) {
-    statement.finalizable._inResetState = false;
+    statement._inResetState = false;
   }
 
   @override
   bool moveNext() {
-    if (statement.finalizable._closed || statement._currentCursor != this) {
+    if (statement._closed || statement._currentCursor != this) {
       return false;
     }