96496adb611ced49ed1c2c778c616d1f8a5d0e6b |
|
23-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Provide an API for enabling foreign key constraints. Also provide a lifecycle method on SQLiteOpenHelper so that applications can configure things like this before the onCreate, onUpgrade, onDowngrade and onOpen callbacks run. Change-Id: If3d1396720bd2e032dd9e034733fb1ff9a9733dd
/frameworks/base/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java
|
47847f3f4dcf2a0dbea0bc0e4f02528e21d37a88 |
|
23-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Support enabling WAL using a flag when DB is opened. Using enableWriteAheadLogging() to enable WAL is inefficient because we previously disabled WAL mode when the database was opened. Switching from WAL to PERSIST then back to WAL is inefficient and could slow down application launch time. It would be better to leave the database in WAL mode when we open it to begin with. To do that, we need to know ahead of time whether we will want to have WAL enabled for the newly opened database. Using this flag also reduces the chance that we will encounter an error enabling WAL mode due to there being other open connections to the database. Bug: 6124556 Change-Id: I38ec7a528baeda9f1ef77e25e88b3ca4b6296200
/frameworks/base/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java
|
d67c8c67899481682657d41a61f3846b8d77d165 |
|
22-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Work around problems changing the database journal mode. Because we always disable WAL mode when a database is first opened (even if we intend to re-enable it), we can encounter problems if there is another open connection to the database somewhere. This can happen for a variety of reasons such as an application opening the same database in multiple processes at the same time or if there is a crashing content provider service that the ActivityManager has removed from its registry but whose process hasn't quite died yet by the time it is restarted in a new process. If we don't change the journal mode, nothing really bad happens. In the worst case, an application that enables WAL might not actually get it, although it can still use connection pooling. Bug: 6124556 Change-Id: Ia2ffdbbc8f82721b170f3bf71bd5242dfd56d9ac
/frameworks/base/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java
|
8dc3cc2e13b500e368f5ba1aacfaf0eddbce668c |
|
02-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Allow the SQLite sync mode to be set independently for WAL. This change leaves the sync mode at FULL for both WAL and non-WAL but makes it easy to change it for one but not the other. To reduce the number of synchronous writes, it might make sense to change the sync mode for non-WAL to NORMAL instead of FULL which should be just as safe. On the other hand, the sync mode for WAL should probably remain FULL because there may be an impact on transaction durability otherwise. Initial experiments show that there might not be a significant performance benefit to using NORMAL, but we may revisit this later. Change-Id: Ifcd55bedcfefa6600974c2295ca5d4163b408cbf
/frameworks/base/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java
|
5936ff097eff2c736af2e43fd4a8f7db0ddcfb5a |
|
01-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Externalize more SQLite configuration options. Moved more configuration into config.xml so we can tweak settings like the default journal mode, WAL auto-checkpoint interval and so on. This change itself should not introduce any functional differences. Change-Id: Id6c95fa25b116ce47e8ae49cd8a80d52b1c0dd80
/frameworks/base/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java
|
559d0645ac8f80491671fa5d3c63e8f296f2909e |
|
29-Feb-2012 |
Jeff Brown <jeffbrown@google.com> |
Refactor SQLiteOpenHelper. Combine the code for opening readable and writable databases. This improves the handling of the case where a database cannot be opened because it cannot be upgraded. Previously we would open the database twice: first read-write, then read-only, each time failing due to the version check. Now only open it once. Removed the goofy locking logic related to upgrading a read-only database to read-write. We now do it in place by reopening the necessary connections in the connection pool. Change-Id: I6deca3fb90e43f4ccb944d4715307fd6fc3e1383
/frameworks/base/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java
|
e5360fbf3efe85427f7e7f59afe7bbeddb4949ac |
|
01-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
Rewrite SQLite database wrappers. The main theme of this change is encapsulation. This change preserves all existing functionality but the implementation is now much cleaner. Instead of a "database lock", access to the database is treated as a resource acquisition problem. If a thread's owns a database connection, then it can access the database; otherwise, it must acquire a database connection first, and potentially wait for other threads to give up theirs. The SQLiteConnectionPool encapsulates the details of how connections are created, configured, acquired, released and disposed. One new feature is that SQLiteConnectionPool can make scheduling decisions about which thread should next acquire a database connection when there is contention among threads. The factors considered include wait queue ordering (fairness among peers), whether the connection is needed for an interactive operation (unfairness on behalf of the UI), and whether the primary connection is needed or if any old connection will do. Thus one goal of the new SQLiteConnectionPool is to improve the utilization of database connections. To emulate some quirks of the old "database lock," we introduce the concept of the primary database connection. The primary database connection is the one that is typically used to perform write operations to the database. When a thread holds the primary database connection, it effectively prevents other threads from modifying the database (although they can still read). What's more, those threads will block when they try to acquire the primary connection, which provides the same kind of mutual exclusion features that the old "database lock" had. (In truth, we probably don't need to be requiring use of the primary database connection in as many places as we do now, but we can seek to refine that behavior in future patches.) Another significant change is that native sqlite3_stmt objects (prepared statements) are fully encapsulated by the SQLiteConnection object that owns them. This ensures that the connection can finalize (destroy) all extant statements that belong to a database connection when the connection is closed. (In the original code, this was very complicated because the sqlite3_stmt objects were managed by SQLiteCompiledSql objects which had different lifetime from the original SQLiteDatabase that created them. Worse, the SQLiteCompiledSql finalizer method couldn't actually destroy the sqlite3_stmt objects because it ran on the finalizer thread and therefore could not guarantee that it could acquire the database lock in order to do the work. This resulted in some rather tortured logic involving a list of pending finalizable statements and a high change of deadlocks or leaks.) Because sqlite3_stmt objects never escape the confines of the SQLiteConnection that owns them, we can also greatly simplify the design of the SQLiteProgram, SQLiteQuery and SQLiteStatement objects. They no longer have to wrangle a native sqlite3_stmt object pointer and manage its lifecycle. So now all they do is hold bind arguments and provide a fancy API. All of the JNI glue related to managing database connections and performing transactions is now bound to SQLiteConnection (rather than being scattered everywhere). This makes sense because SQLiteConnection owns the native sqlite3 object, so it is the only class in the system that can interact with the native SQLite database directly. Encapsulation for the win. One particularly tricky part of this change is managing the ownership of SQLiteConnection objects. At any given time, a SQLiteConnection is either owned by a SQLiteConnectionPool or by a SQLiteSession. SQLiteConnections should never be leaked, but we handle that case too (and yell about it with CloseGuard). A SQLiteSession object is responsible for acquiring and releasing a SQLiteConnection object on behalf of a single thread as needed. For example, the session acquires a connection when a transaction begins and releases it when finished. If the session cannot acquire a connection immediately, then the requested operation blocks until a connection becomes available. SQLiteSessions are thread-local. A SQLiteDatabase assigns a distinct session to each thread that performs database operations. This is very very important. First, it prevents two threads from trying to use the same SQLiteConnection at the same time (because two threads can't share the same session). Second, it prevents a single thread from trying to acquire two SQLiteConnections simultaneously from the same database (because a single thread can't have two sessions for the same database which, in addition to being greedy, could result in a deadlock). There is strict layering between the various database objects, objects at lower layers are not aware of objects at higher layers. Moreover, objects at higher layers generally own objects at lower layers and are responsible for ensuring they are properly disposed when no longer needed (good for the environment). API layer: SQLiteDatabase, SQLiteProgram, SQLiteQuery, SQLiteStatement. Session layer: SQLiteSession. Connection layer: SQLiteConnectionPool, SQLiteConnection. Native layer: JNI glue. By avoiding cyclic dependencies between layers, we make the architecture much more intelligible, maintainable and robust. Finally, this change adds a great deal of new debugging information. It is now possible to view a list of the most recent database operations including how long they took to run using "adb shell dumpsys dbinfo". (Because most of the interesting work happens in SQLiteConnection, it is easy to add debugging instrumentation to track all database operations in one place.) Change-Id: Iffb4ce72d8bcf20b4e087d911da6aa84d2f15297
/frameworks/base/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java
|