Merge "Support for lookaside configuration params" (db0da015) · Commits · e / os / android_frameworks_base

api/current.txt

+23 −0

Original line number	Diff line number	Diff line
		@@ -11872,6 +11872,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();
		@@ -11901,6 +11902,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);
		@@ -11951,6 +11953,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);
		@@ -12004,6 +12026,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
		@@ -12659,6 +12659,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();
		@@ -12688,6 +12689,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);
		@@ -12738,6 +12740,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);
		@@ -12791,6 +12813,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
		@@ -11915,6 +11915,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();
		@@ -11944,6 +11945,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);
		@@ -11994,6 +11996,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);
		@@ -12047,6 +12069,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.