Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3b0c7e7 authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Support for lookaside configuration params 

Modified SQLiteDatabase to allow passing lookaside configuration to its
static initializer. Encapsulated config in OpenParams and added an
overloaded version of openDatabase with the new parameter.

Configuration is changed in SQLiteConnection::nativeOpen, immediately
after opening the database since lookaside memory configuration can only
be changed when no connection is using it.

Added SQLiteOpenHelper.setLookasideConfig method that is called from
the constructor of the subclass.

Test: bit FrameworksCoreTests:android.database.DatabaseGeneralTest
Test: bit FrameworksCoreTests:android.database.SQLiteOpenHelperTest
Bug: 38499845
Change-Id: Ifb761229b43c89c090939030fc25b8c480b9b9e2
parent c1323664

api/current.txt

+23 −0
Original line number Diff line number Diff line
@@ -11868,6 +11868,7 @@ package android.database.sqlite { 
    method public void beginTransactionWithListenerNonExclusive(android.database.sqlite.SQLiteTransactionListener);

    method public android.database.sqlite.SQLiteStatement compileStatement(java.lang.String) throws android.database.SQLException;

    method public static android.database.sqlite.SQLiteDatabase create(android.database.sqlite.SQLiteDatabase.CursorFactory);

    method public static android.database.sqlite.SQLiteDatabase createInMemory(android.database.sqlite.SQLiteDatabase.OpenParams);

    method public int delete(java.lang.String, java.lang.String, java.lang.String[]);

    method public static boolean deleteDatabase(java.io.File);

    method public void disableWriteAheadLogging();
@@ -11897,6 +11898,7 @@ package android.database.sqlite { 
    method public boolean needUpgrade(int);

    method protected void onAllReferencesReleased();

    method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int);

    method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.OpenParams);

    method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler);

    method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.io.File, android.database.sqlite.SQLiteDatabase.CursorFactory);

    method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -11947,6 +11949,26 @@ package android.database.sqlite { 
    method public abstract android.database.Cursor newCursor(android.database.sqlite.SQLiteDatabase, android.database.sqlite.SQLiteCursorDriver, java.lang.String, android.database.sqlite.SQLiteQuery);

  }













  public static final class SQLiteDatabase.OpenParams {













    method public android.database.sqlite.SQLiteDatabase.CursorFactory getCursorFactory();













    method public android.database.DatabaseErrorHandler getErrorHandler();













    method public int getLookasideSlotCount();













    method public int getLookasideSlotSize();













    method public int getOpenFlags();













  }

























  public static final class SQLiteDatabase.OpenParams.Builder {













    ctor public SQLiteDatabase.OpenParams.Builder();













    ctor public SQLiteDatabase.OpenParams.Builder(android.database.sqlite.SQLiteDatabase.OpenParams);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder addOpenFlags(int);













    method public android.database.sqlite.SQLiteDatabase.OpenParams build();













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder removeOpenFlags(int);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setErrorHandler(android.database.DatabaseErrorHandler);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setLookasideConfig(int, int);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setOpenFlags(int);













  }



























  public class SQLiteDatabaseCorruptException extends android.database.sqlite.SQLiteException {















    ctor public SQLiteDatabaseCorruptException();















    ctor public SQLiteDatabaseCorruptException(java.lang.String);










@@ -12000,6 +12022,7 @@ package android.database.sqlite {













    method public void onDowngrade(android.database.sqlite.SQLiteDatabase, int, int);















    method public void onOpen(android.database.sqlite.SQLiteDatabase);















    method public abstract void onUpgrade(android.database.sqlite.SQLiteDatabase, int, int);













    method public void setLookasideConfig(int, int);















    method public void setWriteAheadLoggingEnabled(boolean);















  }







































api/system-current.txt



+23
−0




























Original line number
Diff line number
Diff line








@@ -12655,6 +12655,7 @@ package android.database.sqlite {













    method public void beginTransactionWithListenerNonExclusive(android.database.sqlite.SQLiteTransactionListener);















    method public android.database.sqlite.SQLiteStatement compileStatement(java.lang.String) throws android.database.SQLException;















    method public static android.database.sqlite.SQLiteDatabase create(android.database.sqlite.SQLiteDatabase.CursorFactory);













    method public static android.database.sqlite.SQLiteDatabase createInMemory(android.database.sqlite.SQLiteDatabase.OpenParams);















    method public int delete(java.lang.String, java.lang.String, java.lang.String[]);















    method public static boolean deleteDatabase(java.io.File);















    method public void disableWriteAheadLogging();










@@ -12684,6 +12685,7 @@ package android.database.sqlite {













    method public boolean needUpgrade(int);















    method protected void onAllReferencesReleased();















    method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int);













    method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.OpenParams);















    method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler);















    method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.io.File, android.database.sqlite.SQLiteDatabase.CursorFactory);















    method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory);










@@ -12734,6 +12736,26 @@ package android.database.sqlite {













    method public abstract android.database.Cursor newCursor(android.database.sqlite.SQLiteDatabase, android.database.sqlite.SQLiteCursorDriver, java.lang.String, android.database.sqlite.SQLiteQuery);















  }



























  public static final class SQLiteDatabase.OpenParams {













    method public android.database.sqlite.SQLiteDatabase.CursorFactory getCursorFactory();













    method public android.database.DatabaseErrorHandler getErrorHandler();













    method public int getLookasideSlotCount();













    method public int getLookasideSlotSize();













    method public int getOpenFlags();













  }

























  public static final class SQLiteDatabase.OpenParams.Builder {













    ctor public SQLiteDatabase.OpenParams.Builder();













    ctor public SQLiteDatabase.OpenParams.Builder(android.database.sqlite.SQLiteDatabase.OpenParams);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder addOpenFlags(int);













    method public android.database.sqlite.SQLiteDatabase.OpenParams build();













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder removeOpenFlags(int);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setErrorHandler(android.database.DatabaseErrorHandler);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setLookasideConfig(int, int);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setOpenFlags(int);













  }



























  public class SQLiteDatabaseCorruptException extends android.database.sqlite.SQLiteException {















    ctor public SQLiteDatabaseCorruptException();















    ctor public SQLiteDatabaseCorruptException(java.lang.String);










@@ -12787,6 +12809,7 @@ package android.database.sqlite {













    method public void onDowngrade(android.database.sqlite.SQLiteDatabase, int, int);















    method public void onOpen(android.database.sqlite.SQLiteDatabase);















    method public abstract void onUpgrade(android.database.sqlite.SQLiteDatabase, int, int);













    method public void setLookasideConfig(int, int);















    method public void setWriteAheadLoggingEnabled(boolean);















  }







































api/test-current.txt



+23
−0




























Original line number
Diff line number
Diff line








@@ -11911,6 +11911,7 @@ package android.database.sqlite {













    method public void beginTransactionWithListenerNonExclusive(android.database.sqlite.SQLiteTransactionListener);















    method public android.database.sqlite.SQLiteStatement compileStatement(java.lang.String) throws android.database.SQLException;















    method public static android.database.sqlite.SQLiteDatabase create(android.database.sqlite.SQLiteDatabase.CursorFactory);













    method public static android.database.sqlite.SQLiteDatabase createInMemory(android.database.sqlite.SQLiteDatabase.OpenParams);















    method public int delete(java.lang.String, java.lang.String, java.lang.String[]);















    method public static boolean deleteDatabase(java.io.File);















    method public void disableWriteAheadLogging();










@@ -11940,6 +11941,7 @@ package android.database.sqlite {













    method public boolean needUpgrade(int);















    method protected void onAllReferencesReleased();















    method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int);













    method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.OpenParams);















    method public static android.database.sqlite.SQLiteDatabase openDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory, int, android.database.DatabaseErrorHandler);















    method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.io.File, android.database.sqlite.SQLiteDatabase.CursorFactory);















    method public static android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, android.database.sqlite.SQLiteDatabase.CursorFactory);










@@ -11990,6 +11992,26 @@ package android.database.sqlite {













    method public abstract android.database.Cursor newCursor(android.database.sqlite.SQLiteDatabase, android.database.sqlite.SQLiteCursorDriver, java.lang.String, android.database.sqlite.SQLiteQuery);















  }



























  public static final class SQLiteDatabase.OpenParams {













    method public android.database.sqlite.SQLiteDatabase.CursorFactory getCursorFactory();













    method public android.database.DatabaseErrorHandler getErrorHandler();













    method public int getLookasideSlotCount();













    method public int getLookasideSlotSize();













    method public int getOpenFlags();













  }

























  public static final class SQLiteDatabase.OpenParams.Builder {













    ctor public SQLiteDatabase.OpenParams.Builder();













    ctor public SQLiteDatabase.OpenParams.Builder(android.database.sqlite.SQLiteDatabase.OpenParams);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder addOpenFlags(int);













    method public android.database.sqlite.SQLiteDatabase.OpenParams build();













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder removeOpenFlags(int);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setErrorHandler(android.database.DatabaseErrorHandler);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setLookasideConfig(int, int);













    method public android.database.sqlite.SQLiteDatabase.OpenParams.Builder setOpenFlags(int);













  }



























  public class SQLiteDatabaseCorruptException extends android.database.sqlite.SQLiteException {















    ctor public SQLiteDatabaseCorruptException();















    ctor public SQLiteDatabaseCorruptException(java.lang.String);










@@ -12043,6 +12065,7 @@ package android.database.sqlite {













    method public void onDowngrade(android.database.sqlite.SQLiteDatabase, int, int);















    method public void onOpen(android.database.sqlite.SQLiteDatabase);















    method public abstract void onUpgrade(android.database.sqlite.SQLiteDatabase, int, int);













    method public void setLookasideConfig(int, int);















    method public void setWriteAheadLoggingEnabled(boolean);















  }







































core/java/android/database/sqlite/SQLiteConnection.java



+8
−7




























Original line number
Diff line number
Diff line








@@ -16,9 +16,6 @@





























package android.database.sqlite;





























import dalvik.system.BlockGuard;













import dalvik.system.CloseGuard;





























import android.database.Cursor;















import android.database.CursorWindow;















import android.database.DatabaseUtils;









@@ -32,11 +29,14 @@ import android.util.Log;













import android.util.LruCache;















import android.util.Printer;





























import dalvik.system.BlockGuard;













import dalvik.system.CloseGuard;





























import java.text.SimpleDateFormat;















import java.util.ArrayList;















import java.util.Date;















import java.util.Map;













import java.util.regex.Pattern;













































/**















 * Represents a SQLite database connection.










@@ -118,7 +118,8 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen













    private int mCancellationSignalAttachCount;































    private static native long nativeOpen(String path, int openFlags, String label,













            boolean enableTrace, boolean enableProfile);













            boolean enableTrace, boolean enableProfile, int lookasideSlotSize,













            int lookasideSlotCount);















    private static native void nativeClose(long connectionPtr);















    private static native void nativeRegisterCustomFunction(long connectionPtr,















            SQLiteCustomFunction function);










@@ -208,8 +209,8 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen













    private void open() {















        mConnectionPtr = nativeOpen(mConfiguration.path, mConfiguration.openFlags,















                mConfiguration.label,













                SQLiteDebug.DEBUG_SQL_STATEMENTS, SQLiteDebug.DEBUG_SQL_TIME);



























                SQLiteDebug.DEBUG_SQL_STATEMENTS, SQLiteDebug.DEBUG_SQL_TIME,













                mConfiguration.lookasideSlotSize, mConfiguration.lookasideSlotCount);















        setPageSize();















        setForeignKeyModeFromConfiguration();















        setWalModeFromConfiguration();

































core/java/android/database/sqlite/SQLiteDatabase.java



+292
−12


























File changed.
Preview size limit exceeded, changes collapsed.