Switch sqlite temp storage to disk; fix failures in V16 #11600
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mikehardy
added
the
Blocked by dependency
mikehardy
reviewed
Jun 11, 2022
| @@ -27,6 +28,10 @@ object DroidBackendFactory { | |||
|
|
|||
| @JvmStatic | |||
| fun getInstance(): DroidBackend { | |||
| // Prevent sqlite throwing error 6410 due to the lack of /tmp | |||
| val dir = AnkiDroidApp.getInstance().applicationContext.cacheDir | |||
| Os.setenv("TMPDIR", dir.path, false) | |||
There was a problem hiding this comment.
Discussion began here: ankitects/anki@f15e294#r75810592
I'm +1 on this change I think it is the only way to be sure we won't overflow JVM heap on android
Original fix attempt and discussion at ankidroid/Anki-Android-Backend#193
|
I've updated this so it will apply cleanly without the Java backend change. |
mikehardy
approved these changes
Jun 13, 2022
|
Pulled locally:
mike@bistromath:~/work/AnkiDroid/Anki-Android-Upstream (tmp-fix *) % git stash show -p
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.java b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.java
index fcb25ce71..aff48859f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.java
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.java
@@ -87,7 +87,7 @@ public class AnkiDroidApp extends Application {
*
* Set this and {@link com.ichi2.libanki.Consts#SCHEMA_VERSION} to 16.
*/
- public static boolean TESTING_USE_V16_BACKEND = false;
+ public static boolean TESTING_USE_V16_BACKEND = true;
public static final String XML_CUSTOM_NAMESPACE = "http://arbitrary.app.namespace/com.ichi2.anki";
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Consts.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Consts.kt
index 495b5ec00..b79144952 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/Consts.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/Consts.kt
@@ -106,7 +106,7 @@ object Consts {
// deck schema & syncing vars
@JvmField
- var SCHEMA_VERSION = 11
+ var SCHEMA_VERSION = 16
/** The database schema version that we can downgrade from */
const val SCHEMA_DOWNGRADE_SUPPORTED_VERSION = 16...and that fails That's not a regression, it is what I see on main (running V16 test on existing V11 collection not working for me) so this seems good Definitely not a regression for V11 folks not doing V16-experimental stuff on main |
mikehardy
added
Backend Related
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original fix attempt and discussion at ankidroid/Anki-Android-Backend#193
Depends on #11581